diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index df4bf79..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [ master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '18 18 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - - run: "mvn clean compile -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true" - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml deleted file mode 100644 index d59702c..0000000 --- a/.github/workflows/pipeline.yml +++ /dev/null @@ -1,228 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://docs.github.com/en/actions/learn-github-actions or https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions - -name: Java CI with Maven - -on: - push: - # branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - # old-school build and jar method. No tests run or compiled. - build-1_6: - name: Java 1.6 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup java - uses: actions/setup-java@v1 - with: - java-version: 1.6 - - name: Compile Java 1.6 - run: | - mkdir -p target/classes - javac -version - javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java - - name: Create java 1.6 JAR - run: | - jar cvf target/org.json.jar -C target/classes . - - name: Upload JAR 1.6 - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Create java 1.6 JAR - path: target/*.jar - - build-8: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 8 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar - - build-11: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 11 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar - - build-17: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 17 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar - - build-21: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 21 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar diff --git a/build.gradle b/build.gradle index 3961e85..84aaee7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,15 +2,8 @@ * This file was generated by the Gradle 'init' task. */ apply plugin: 'java' -apply plugin: 'eclipse' -// apply plugin: 'jacoco' apply plugin: 'maven-publish' -//plugins { - // id 'java' - //id 'maven-publish' -// } - repositories { mavenLocal() mavenCentral() @@ -25,12 +18,8 @@ dependencies { testImplementation 'org.mockito:mockito-core:4.2.0' } -subprojects { - tasks.withType(Javadoc).all { enabled = false } -} - -group = 'org.json' -version = 'v20250107-SNAPSHOT' +group = 'org.json.compat' +version = 'v20250107-local' description = 'JSON in Java' sourceCompatibility = '1.8' @@ -45,6 +34,7 @@ java { publishing { publications { maven(MavenPublication) { + artifactId = 'json' from(components.java) } } @@ -66,7 +56,7 @@ task modifyStrictMode { doLast { println "Modifying JSONParserConfiguration.java to enable strictMode..." - def filePath = project.file('src/main/java/org/json/JSONParserConfiguration.java') + def filePath = project.file('src/main/java/org/json/compat/JSONParserConfiguration.java') if (!filePath.exists()) { throw new GradleException("Could not find file: ${filePath.absolutePath}") @@ -92,7 +82,7 @@ task restoreStrictMode { doLast { println "Restoring original JSONParserConfiguration.java..." - def filePath = project.file('src/main/java/org/json/JSONParserConfiguration.java') + def filePath = project.file('src/main/java/org/json/compat/JSONParserConfiguration.java') def backupFile = new File(filePath.absolutePath + '.bak') if (backupFile.exists()) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b4429..2733ed5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 80c9b89..0000000 --- a/pom.xml +++ /dev/null @@ -1,254 +0,0 @@ - - 4.0.0 - - org.json - json - 20250107 - bundle - - JSON in Java - - JSON is a light-weight, language independent, data interchange format. - See http://www.JSON.org/ - - The files in this package implement JSON encoders/decoders in Java. - It also includes the capability to convert between JSON and XML, HTTP - headers, Cookies, and CDL. - - This is a reference implementation. There are a large number of JSON packages - in Java. Perhaps someday the Java community will standardize on one. Until - then, choose carefully. - - https://github.com/douglascrockford/JSON-java - - - https://github.com/douglascrockford/JSON-java.git - scm:git:git://github.com/douglascrockford/JSON-java.git - scm:git:git@github.com:douglascrockford/JSON-java.git - - - - - Public Domain - https://github.com/stleary/JSON-java/blob/master/LICENSE - repo - - - - - - Douglas Crockford - douglas@crockford.com - - - - - UTF-8 - - - - - - ossrh - Central Repository OSSRH - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - junit - junit - 4.13.2 - test - - - com.jayway.jsonpath - json-path - 2.9.0 - test - - - org.mockito - mockito-core - 4.2.0 - test - - - - - - - org.apache.felix - maven-bundle-plugin - 5.1.9 - true - - - - org.json - - ${project.artifactId} - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 1.8 - 1.8 - - -Xlint:unchecked - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - - jar - - - -Xdoclint:none - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - ossrh - https://oss.sonatype.org/ - false - - - - org.moditect - moditect-maven-plugin - 1.0.0.Final - - - add-module-infos - package - - add-module-info - - - 9 - - - module org.json { - exports org.json; - } - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - - - - test-strict-mode - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - - enable-strict-mode - process-sources - - replace - - - src/main/java/org/json/JSONParserConfiguration.java - - - // this.strictMode = true; - this.strictMode = true; - - - - - - - restore-original - test - - replace - - - src/main/java/org/json/JSONParserConfiguration.java - - - this.strictMode = true; - // this.strictMode = true; - - - - - - - - - - - - diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/compat/CDL.java similarity index 95% rename from src/main/java/org/json/CDL.java rename to src/main/java/org/json/compat/CDL.java index dd631bf..143e845 100644 --- a/src/main/java/org/json/CDL.java +++ b/src/main/java/org/json/compat/CDL.java @@ -1,4 +1,4 @@ -package org.json; +package org.json.compat; /* Public Domain. @@ -100,15 +100,11 @@ public class CDL { for (;;) { String value = getValue(x,delimiter); char c = x.next(); - if (value != null) { - ja.put(value); - } else if (ja.length() == 0 && c != delimiter) { + if (value == null || + (ja.length() == 0 && value.length() == 0 && c != delimiter)) { return null; - } else { - // This line accounts for CSV ending with no newline - ja.put(""); } - + ja.put(value); for (;;) { if (c == delimiter) { break; @@ -311,17 +307,6 @@ public class CDL { if (ja.length() == 0) { return null; } - - // The following block accounts for empty datasets (no keys or vals) - if (ja.length() == 1) { - JSONObject j = ja.getJSONObject(0); - if (j.length() == 1) { - String key = j.keys().next(); - if ("".equals(key) && "".equals(j.get(key))) { - return null; - } - } - } return ja; } diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/compat/Cookie.java similarity index 99% rename from src/main/java/org/json/Cookie.java rename to src/main/java/org/json/compat/Cookie.java index ab908a3..33ed3e2 100644 --- a/src/main/java/org/json/Cookie.java +++ b/src/main/java/org/json/compat/Cookie.java @@ -1,4 +1,4 @@ -package org.json; +package org.json.compat; import java.util.Locale; diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/compat/CookieList.java similarity index 98% rename from src/main/java/org/json/CookieList.java rename to src/main/java/org/json/compat/CookieList.java index d1064db..52d444d 100644 --- a/src/main/java/org/json/CookieList.java +++ b/src/main/java/org/json/compat/CookieList.java @@ -1,4 +1,4 @@ -package org.json; +package org.json.compat; /* Public Domain. diff --git a/src/main/java/org/json/HTTP.java b/src/main/java/org/json/compat/HTTP.java similarity index 99% rename from src/main/java/org/json/HTTP.java rename to src/main/java/org/json/compat/HTTP.java index 44ab3a6..ade9203 100644 --- a/src/main/java/org/json/HTTP.java +++ b/src/main/java/org/json/compat/HTTP.java @@ -1,4 +1,4 @@ -package org.json; +package org.json.compat; /* Public Domain. diff --git a/src/main/java/org/json/HTTPTokener.java b/src/main/java/org/json/compat/HTTPTokener.java similarity index 98% rename from src/main/java/org/json/HTTPTokener.java rename to src/main/java/org/json/compat/HTTPTokener.java index 48cad31..f30b4e8 100644 --- a/src/main/java/org/json/HTTPTokener.java +++ b/src/main/java/org/json/compat/HTTPTokener.java @@ -1,4 +1,4 @@ -package org.json; +package org.json.compat; /* Public Domain. diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/compat/JSONArray.java similarity index 94% rename from src/main/java/org/json/JSONArray.java rename to src/main/java/org/json/compat/JSONArray.java index e2725b7..d1f2058 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/org/json/compat/JSONArray.java @@ -1,4 +1,4 @@ -package org.json; +package org.json.compat; /* Public Domain. @@ -75,19 +75,20 @@ public class JSONArray implements Iterable { } /** - * Construct a JSONArray from a JSONTokener. + * Constructs a JSONArray from a JSONTokener. + *

+ * This constructor reads the JSONTokener to parse a JSON array. It uses the default JSONParserConfiguration. * - * @param x - * A JSONTokener - * @throws JSONException - * If there is a syntax error. + * @param x A JSONTokener + * @throws JSONException If there is a syntax error. */ public JSONArray(JSONTokener x) throws JSONException { - this(x, x.getJsonParserConfiguration()); + this(x, new JSONParserConfiguration()); } /** * Constructs a JSONArray from a JSONTokener and a JSONParserConfiguration. + * JSONParserConfiguration contains strictMode turned off (false) by default. * * @param x A JSONTokener instance from which the JSONArray is constructed. * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser. @@ -95,67 +96,83 @@ public class JSONArray implements Iterable { */ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException { this(); + char nextChar = x.nextClean(); - boolean isInitial = x.getPrevious() == 0; - if (x.nextClean() != '[') { + // check first character, if not '[' throw JSONException + if (nextChar != '[') { throw x.syntaxError("A JSONArray text must start with '['"); } - char nextChar = x.nextClean(); - if (nextChar == 0) { - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - } - if (nextChar != ']') { - x.back(); - for (;;) { - if (x.nextClean() == ',') { - x.back(); - this.myArrayList.add(JSONObject.NULL); - } else { - x.back(); - this.myArrayList.add(x.nextValue()); + parseTokener(x, jsonParserConfiguration); // runs recursively + + } + + private void parseTokener(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) { + boolean strictMode = jsonParserConfiguration.isStrictMode(); + + char cursor = x.nextClean(); + + switch (cursor) { + case 0: + throwErrorIfEoF(x); + break; + case ',': + cursor = x.nextClean(); + + throwErrorIfEoF(x); + + if(strictMode && cursor == ']'){ + throw x.syntaxError(getInvalidCharErrorMsg(cursor)); } - switch (x.nextClean()) { - case 0: - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - case ',': - nextChar = x.nextClean(); - if (nextChar == 0) { - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - } - if (nextChar == ']') { - // trailing commas are not allowed in strict mode - if (jsonParserConfiguration.isStrictMode()) { - throw x.syntaxError("Strict mode error: Expected another array element"); - } - return; - } - if (nextChar == ',') { - // consecutive commas are not allowed in strict mode - if (jsonParserConfiguration.isStrictMode()) { - throw x.syntaxError("Strict mode error: Expected a valid array element"); - } - return; - } - x.back(); + + if (cursor == ']') { break; - case ']': - if (isInitial && jsonParserConfiguration.isStrictMode() && - x.nextClean() != 0) { - throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text"); - } - return; - default: - throw x.syntaxError("Expected a ',' or ']'"); } - } - } else { - if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) { - throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text"); - } + + x.back(); + + parseTokener(x, jsonParserConfiguration); + break; + case ']': + if (strictMode) { + cursor = x.nextClean(); + boolean isEoF = x.end(); + + if (isEoF) { + break; + } + + if (x.getArrayLevel() == 0) { + throw x.syntaxError(getInvalidCharErrorMsg(cursor)); + } + + x.back(); + } + break; + default: + x.back(); + boolean currentCharIsQuote = x.getPrevious() == '"'; + boolean quoteIsNotNextToValidChar = x.getPreviousChar() != ',' && x.getPreviousChar() != '['; + + if (strictMode && currentCharIsQuote && quoteIsNotNextToValidChar) { + throw x.syntaxError(getInvalidCharErrorMsg(cursor)); + } + + this.myArrayList.add(x.nextValue(jsonParserConfiguration)); + parseTokener(x, jsonParserConfiguration); + } + } + + /** + * Throws JSONException if JSONTokener has reached end of file, usually when array is unclosed. No ']' found, + * instead EoF. + * + * @param x the JSONTokener being evaluated. + * @throws JSONException if JSONTokener has reached end of file. + */ + private void throwErrorIfEoF(JSONTokener x) { + if (x.end()) { + throw x.syntaxError(String.format("Expected a ',' or ']' but instead found '%s'", x.getPrevious())); } } @@ -170,22 +187,19 @@ public class JSONArray implements Iterable { * If there is a syntax error. */ public JSONArray(String source) throws JSONException { - this(source, new JSONParserConfiguration()); + this(new JSONTokener(source), new JSONParserConfiguration()); } /** - * Construct a JSONArray from a source JSON text. + * Constructs a JSONArray from a source JSON text and a JSONParserConfiguration. * - * @param source - * A string that begins with [ (left - * bracket) and ends with ] - *  (right bracket). - * @param jsonParserConfiguration the parser config object - * @throws JSONException - * If there is a syntax error. + * @param source A string that begins with [ (left bracket) and + * ends with ]  (right bracket). + * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser. + * @throws JSONException If there is a syntax error. */ public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException { - this(new JSONTokener(source, jsonParserConfiguration), jsonParserConfiguration); + this(new JSONTokener(source), jsonParserConfiguration); } /** @@ -414,7 +428,7 @@ public class JSONArray implements Iterable { /** * Get the enum value associated with an index. - * + * * @param * Enum Type * @param clazz @@ -602,7 +616,7 @@ public class JSONArray implements Iterable { if (len == 0) { return ""; } - + StringBuilder sb = new StringBuilder( JSONObject.valueToString(this.myArrayList.get(0))); @@ -916,7 +930,7 @@ public class JSONArray implements Iterable { /** * Get the enum value associated with a key. - * + * * @param * Enum Type * @param clazz @@ -931,7 +945,7 @@ public class JSONArray implements Iterable { /** * Get the enum value associated with a key. - * + * * @param * Enum Type * @param clazz @@ -964,8 +978,8 @@ public class JSONArray implements Iterable { } /** - * Get the optional BigInteger value associated with an index. The - * defaultValue is returned if there is no value for the index, or if the + * Get the optional BigInteger value associated with an index. The + * defaultValue is returned if there is no value for the index, or if the * value is not a number and cannot be converted to a number. * * @param index @@ -980,8 +994,8 @@ public class JSONArray implements Iterable { } /** - * Get the optional BigDecimal value associated with an index. The - * defaultValue is returned if there is no value for the index, or if the + * Get the optional BigDecimal value associated with an index. The + * defaultValue is returned if there is no value for the index, or if the * value is not a number and cannot be converted to a number. If the value * is float or double, the {@link BigDecimal#BigDecimal(double)} * constructor will be used. See notes on the constructor for conversion @@ -1150,7 +1164,7 @@ public class JSONArray implements Iterable { if (val instanceof Number){ return (Number) val; } - + if (val instanceof String) { try { return JSONObject.stringToNumber((String) val); @@ -1227,7 +1241,7 @@ public class JSONArray implements Iterable { public JSONArray put(double value) throws JSONException { return this.put(Double.valueOf(value)); } - + /** * Append a float value. This increases the array's length by one. * @@ -1482,19 +1496,19 @@ public class JSONArray implements Iterable { * * @param collection * A Collection. - * @return this. + * @return this. */ public JSONArray putAll(Collection collection) { this.addAll(collection, false); return this; } - + /** * Put an Iterable's elements in to the JSONArray. * * @param iter * An Iterable. - * @return this. + * @return this. */ public JSONArray putAll(Iterable iter) { this.addAll(iter, false); @@ -1506,7 +1520,7 @@ public class JSONArray implements Iterable { * * @param array * A JSONArray. - * @return this. + * @return this. */ public JSONArray putAll(JSONArray array) { // directly copy the elements from the source array to this one @@ -1521,7 +1535,7 @@ public class JSONArray implements Iterable { * @param array * Array. If the parameter passed is null, or not an array or Iterable, an * exception will be thrown. - * @return this. + * @return this. * * @throws JSONException * If not an array, JSONArray, Iterable or if an value is non-finite number. @@ -1532,9 +1546,9 @@ public class JSONArray implements Iterable { this.addAll(array, false); return this; } - + /** - * Creates a JSONPointer using an initialization string and tries to + * Creates a JSONPointer using an initialization string and tries to * match it to an item within this JSONArray. For example, given a * JSONArray initialized with this document: * 
@@ -1542,7 +1556,7 @@ public class JSONArray implements Iterable {
      *     {"b":"c"}
      * ]
      * 
-     * and this JSONPointer string: 
+     * and this JSONPointer string:
      * 
      * "/0/b"
      * 

@@ -1555,9 +1569,9 @@ public class JSONArray implements Iterable {
     public Object query(String jsonPointer) {
         return query(new JSONPointer(jsonPointer));
     }
-    
+
     /**
-     * Uses a user initialized JSONPointer  and tries to 
+     * Uses a user initialized JSONPointer  and tries to
      * match it to an item within this JSONArray. For example, given a
      * JSONArray initialized with this document:
      * 
@@ -1565,7 +1579,7 @@ public class JSONArray implements Iterable {
      *     {"b":"c"}
      * ]
      * 
-     * and this JSONPointer: 
+     * and this JSONPointer:
      * 
      * "/0/b"
      * 

@@ -1578,11 +1592,11 @@ public class JSONArray implements Iterable {
     public Object query(JSONPointer jsonPointer) {
         return jsonPointer.queryFrom(this);
     }
-    
+
     /**
      * Queries and returns a value from this object using {@code jsonPointer}, or
      * returns null if the query fails due to a missing key.
-     * 
+     *
      * @param jsonPointer the string representation of the JSON pointer
      * @return the queried value or {@code null}
      * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
@@ -1590,11 +1604,11 @@ public class JSONArray implements Iterable {
     public Object optQuery(String jsonPointer) {
     	return optQuery(new JSONPointer(jsonPointer));
     }
-    
+
     /**
      * Queries and returns a value from this object using {@code jsonPointer}, or
      * returns null if the query fails due to a missing key.
-     * 
+     *
      * @param jsonPointer The JSON pointer
      * @return the queried value or {@code null}
      * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
@@ -1714,11 +1728,11 @@ public class JSONArray implements Iterable {
 
     /**
      * Make a pretty-printed JSON text of this JSONArray.
-     * 
+     *
      * 
If 
 {@code indentFactor > 0}
 and the {@link JSONArray} has only
      * one element, then the array will be output on a single line:
      * 
{@code [1]}

-     * 
+     *
      * 
If an array has 2 or more elements, then it will be output across
      * multiple lines: 
{@code
      * [
@@ -1730,7 +1744,7 @@ public class JSONArray implements Iterable {
      * 

      * Warning: This method assumes that the data structure is acyclical.
      * 
-     * 
+     *
      * @param indentFactor
      *            The number of spaces to add to each level of indentation.
      * @return a printable, displayable, transmittable representation of the
@@ -1764,11 +1778,11 @@ public class JSONArray implements Iterable {
 
     /**
      * Write the contents of the JSONArray as JSON text to a writer.
-     * 
+     *
      * 
If 
{@code indentFactor > 0}
 and the {@link JSONArray} has only
      * one element, then the array will be output on a single line:
      * 
{@code [1]}

-     * 
+     *
      * 
If an array has 2 or more elements, then it will be output across
      * multiple lines: 
{@code
      * [
@@ -1948,6 +1962,7 @@ public class JSONArray implements Iterable {
     private void addAll(Object array, boolean wrap, int recursionDepth) {
         addAll(array, wrap, recursionDepth, new JSONParserConfiguration());
     }
+
     /**
      * Add an array's elements to the JSONArray.
      *`
@@ -1986,7 +2001,7 @@ public class JSONArray implements Iterable {
             // JSONArray
             this.myArrayList.addAll(((JSONArray)array).myArrayList);
         } else if (array instanceof Collection) {
-            this.addAll((Collection)array, wrap, recursionDepth, jsonParserConfiguration);
+            this.addAll((Collection)array, wrap, recursionDepth);
         } else if (array instanceof Iterable) {
             this.addAll((Iterable)array, wrap);
         } else {
@@ -1994,7 +2009,6 @@ public class JSONArray implements Iterable {
                     "JSONArray initial value should be a string or collection or array.");
         }
     }
-    
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param idx index of the item
@@ -2023,4 +2037,7 @@ public class JSONArray implements Iterable {
                 , cause);
     }
 
+    private static String getInvalidCharErrorMsg(char cursor) {
+        return String.format("invalid character '%s' found after end of array", cursor);
+    }
 }
diff --git a/src/main/java/org/json/JSONException.java b/src/main/java/org/json/compat/JSONException.java
similarity index 97%
rename from src/main/java/org/json/JSONException.java
rename to src/main/java/org/json/compat/JSONException.java
index 02c29f3..e2c59bc 100644
--- a/src/main/java/org/json/JSONException.java
+++ b/src/main/java/org/json/compat/JSONException.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/compat/JSONML.java
similarity index 99%
rename from src/main/java/org/json/JSONML.java
rename to src/main/java/org/json/compat/JSONML.java
index 7b53e4d..0e5d599 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/compat/JSONML.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONMLParserConfiguration.java b/src/main/java/org/json/compat/JSONMLParserConfiguration.java
similarity index 99%
rename from src/main/java/org/json/JSONMLParserConfiguration.java
rename to src/main/java/org/json/compat/JSONMLParserConfiguration.java
index 43ba0db..c5fda1e 100644
--- a/src/main/java/org/json/JSONMLParserConfiguration.java
+++ b/src/main/java/org/json/compat/JSONMLParserConfiguration.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 /*
 Public Domain.
 */
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/compat/JSONObject.java
similarity index 98%
rename from src/main/java/org/json/JSONObject.java
rename to src/main/java/org/json/compat/JSONObject.java
index a1664f7..cc63d2e 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/compat/JSONObject.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
@@ -195,7 +195,7 @@ public class JSONObject {
      *             duplicated key.
      */
     public JSONObject(JSONTokener x) throws JSONException {
-        this(x, x.getJsonParserConfiguration());
+        this(x, new JSONParserConfiguration());
     }
 
     /**
@@ -214,23 +214,18 @@ public class JSONObject {
         char c;
         String key;
 
-        boolean isInitial = x.getPrevious() == 0;
-
         if (x.nextClean() != '{') {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
         for (;;) {
             c = x.nextClean();
             switch (c) {
-            case 0:
-                throw x.syntaxError("A JSONObject text must end with '}'");
-            case '}':
-                if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
-                    throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
-                }
-                return;
-            default:
-                key = x.nextSimpleValue(c).toString();
+                case 0:
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                case '}':
+                    return;
+                default:
+                    key = x.nextSimpleValue(c, jsonParserConfiguration).toString();
             }
 
             // The key is followed by ':'.
@@ -249,7 +244,7 @@ public class JSONObject {
                     throw x.syntaxError("Duplicate key \"" + key + "\"");
                 }
 
-                Object value = x.nextValue();
+                Object value = x.nextValue(jsonParserConfiguration);
                 // Only add value if non-null
                 if (value != null) {
                     this.put(key, value);
@@ -260,16 +255,8 @@ public class JSONObject {
 
             switch (x.nextClean()) {
             case ';':
-                // In strict mode semicolon is not a valid separator
-                if (jsonParserConfiguration.isStrictMode()) {
-                    throw x.syntaxError("Strict mode error: Invalid character ';' found");
-                }
             case ',':
                 if (x.nextClean() == '}') {
-                    // trailing commas are not allowed in strict mode
-                    if (jsonParserConfiguration.isStrictMode()) {
-                        throw x.syntaxError("Strict mode error: Expected another object element");
-                    }
                     return;
                 }
                 if (x.end()) {
@@ -278,9 +265,6 @@ public class JSONObject {
                 x.back();
                 break;
             case '}':
-                if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
-                    throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
-                }
                 return;
             default:
                 throw x.syntaxError("Expected a ',' or '}'");
@@ -332,7 +316,7 @@ public class JSONObject {
         	        throw new NullPointerException("Null key.");
         	    }
                 final Object value = e.getValue();
-                if (value != null || jsonParserConfiguration.isUseNativeNulls()) {
+                if (value != null) {
                     testValidity(value);
                     this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1, jsonParserConfiguration));
                 }
@@ -466,7 +450,7 @@ public class JSONObject {
      *                duplicated key.
      */
     public JSONObject(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
-        this(new JSONTokener(source, jsonParserConfiguration), jsonParserConfiguration);
+        this(new JSONTokener(source), jsonParserConfiguration);
     }
 
     /**
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/compat/JSONParserConfiguration.java
similarity index 60%
rename from src/main/java/org/json/JSONParserConfiguration.java
rename to src/main/java/org/json/compat/JSONParserConfiguration.java
index 0cfa2ea..2a2ac34 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/compat/JSONParserConfiguration.java
@@ -1,18 +1,27 @@
-package org.json;
+package org.json.compat;
 
 /**
  * Configuration object for the JSON parser. The configuration is immutable.
  */
 public class JSONParserConfiguration extends ParserConfiguration {
+
+    /** Original Configuration of the JSON Parser. */
+    public static final JSONParserConfiguration ORIGINAL = new JSONParserConfiguration();
+
+    /** Original configuration of the JSON Parser except that values are kept as strings. */
+    public static final JSONParserConfiguration KEEP_STRINGS = new JSONParserConfiguration().withKeepStrings(true);
+
     /**
      * Used to indicate whether to overwrite duplicate key or not.
      */
     private boolean overwriteDuplicateKey;
-    
+
     /**
-     * Used to indicate whether to convert java null values to JSONObject.NULL or ignoring the entry when converting java maps.
+     * This flag, when set to true, instructs the parser to throw a JSONException if it encounters an invalid character
+     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
+     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
      */
-    private boolean useNativeNulls;
+    private boolean strictMode;
 
     /**
      * Configuration with the default values.
@@ -20,24 +29,13 @@ public class JSONParserConfiguration extends ParserConfiguration {
     public JSONParserConfiguration() {
         super();
         this.overwriteDuplicateKey = false;
-        // DO NOT DELETE THE FOLLOWING LINE -- it is used for strictMode testing
-        // this.strictMode = true;
     }
 
-    /**
-     * This flag, when set to true, instructs the parser to enforce strict mode when parsing JSON text.
-     * Garbage chars at the end of the doc, unquoted string, and single-quoted strings are all disallowed.
-     */
-    private boolean strictMode;
-
     @Override
     protected JSONParserConfiguration clone() {
         JSONParserConfiguration clone = new JSONParserConfiguration();
         clone.overwriteDuplicateKey = overwriteDuplicateKey;
-        clone.strictMode = strictMode;
         clone.maxNestingDepth = maxNestingDepth;
-        clone.keepStrings = keepStrings;
-        clone.useNativeNulls = useNativeNulls;
         return clone;
     }
 
@@ -73,33 +71,7 @@ public class JSONParserConfiguration extends ParserConfiguration {
 
         return clone;
     }
-    
-    /**
-     * Controls the parser's behavior when meeting Java null values while converting maps.
-     * If set to true, the parser will put a JSONObject.NULL into the resulting JSONObject.
-     * Or the map entry will be ignored.
-     *
-     * @param useNativeNulls defines if the parser should convert null values in Java maps
-     * @return The existing configuration will not be modified. A new configuration is returned.
-     */
-    public JSONParserConfiguration withUseNativeNulls(final boolean useNativeNulls) {
-        JSONParserConfiguration clone = this.clone();
-        clone.useNativeNulls = useNativeNulls;
 
-        return clone;
-    }
-
-    /**
-     * Sets the strict mode configuration for the JSON parser with default true value
-     * 

-     * When strict mode is enabled, the parser will throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
-     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
-     * @return a new JSONParserConfiguration instance with the updated strict mode setting
-     */
-    public JSONParserConfiguration withStrictMode() {
-        return withStrictMode(true);
-    }
 
     /**
      * Sets the strict mode configuration for the JSON parser.
@@ -127,24 +99,16 @@ public class JSONParserConfiguration extends ParserConfiguration {
     public boolean isOverwriteDuplicateKey() {
         return this.overwriteDuplicateKey;
     }
-    
-    /**
-     * The parser's behavior when meeting a null value in a java map, controls whether the parser should 
-     * write a JSON entry with a null value (isUseNativeNulls() == true) 
-     * or ignore that map entry (isUseNativeNulls() == false).
-     *
-     * @return The useNativeNulls configuration value.
-     */
-    public boolean isUseNativeNulls() {
-        return this.useNativeNulls;
-    }
-    
+
 
     /**
-     * The parser throws an Exception when strict mode is true and tries to parse invalid JSON characters.
-     * Otherwise, the parser is more relaxed and might tolerate some invalid characters.
+     * Retrieves the current strict mode setting of the JSON parser.
+     * 

+     * Strict mode, when enabled, instructs the parser to throw a JSONException if it encounters an invalid character
+     * immediately following the final ']' character in the input. This ensures strict adherence to the JSON syntax, as
+     * any characters after the final closing bracket of a JSON array are considered invalid.
      *
-     * @return the current strict mode setting.
+     * @return the current strict mode setting. True if strict mode is enabled, false otherwise.
      */
     public boolean isStrictMode() {
         return this.strictMode;
diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/compat/JSONPointer.java
similarity index 99%
rename from src/main/java/org/json/JSONPointer.java
rename to src/main/java/org/json/compat/JSONPointer.java
index 859e1e6..280f16c 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/compat/JSONPointer.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 import static java.lang.String.format;
 
diff --git a/src/main/java/org/json/JSONPointerException.java b/src/main/java/org/json/compat/JSONPointerException.java
similarity index 97%
rename from src/main/java/org/json/JSONPointerException.java
rename to src/main/java/org/json/compat/JSONPointerException.java
index dc5a25a..0cacae9 100644
--- a/src/main/java/org/json/JSONPointerException.java
+++ b/src/main/java/org/json/compat/JSONPointerException.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONPropertyIgnore.java b/src/main/java/org/json/compat/JSONPropertyIgnore.java
similarity index 96%
rename from src/main/java/org/json/JSONPropertyIgnore.java
rename to src/main/java/org/json/compat/JSONPropertyIgnore.java
index d3a5bc5..2bc787b 100644
--- a/src/main/java/org/json/JSONPropertyIgnore.java
+++ b/src/main/java/org/json/compat/JSONPropertyIgnore.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/org/json/compat/JSONPropertyName.java
similarity index 96%
rename from src/main/java/org/json/JSONPropertyName.java
rename to src/main/java/org/json/compat/JSONPropertyName.java
index 0e4123f..f0c43d6 100644
--- a/src/main/java/org/json/JSONPropertyName.java
+++ b/src/main/java/org/json/compat/JSONPropertyName.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONString.java b/src/main/java/org/json/compat/JSONString.java
similarity index 96%
rename from src/main/java/org/json/JSONString.java
rename to src/main/java/org/json/compat/JSONString.java
index cd8d184..acc1e02 100644
--- a/src/main/java/org/json/JSONString.java
+++ b/src/main/java/org/json/compat/JSONString.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONStringer.java b/src/main/java/org/json/compat/JSONStringer.java
similarity index 98%
rename from src/main/java/org/json/JSONStringer.java
rename to src/main/java/org/json/compat/JSONStringer.java
index 2f6cf9e..4899d37 100644
--- a/src/main/java/org/json/JSONStringer.java
+++ b/src/main/java/org/json/compat/JSONStringer.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/compat/JSONTokener.java
similarity index 62%
rename from src/main/java/org/json/JSONTokener.java
rename to src/main/java/org/json/compat/JSONTokener.java
index a90d51a..ed914f3 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/compat/JSONTokener.java
@@ -1,7 +1,9 @@
-package org.json;
+package org.json.compat;
 
 import java.io.*;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
 
 /*
 Public Domain.
@@ -31,28 +33,16 @@ public class JSONTokener {
     private boolean usePrevious;
     /** the number of characters read in the previous line. */
     private long characterPreviousLine;
+    private final List smallCharMemory;
+    private int arrayLevel = 0;
 
-    // access to this object is required for strict mode checking
-    private JSONParserConfiguration jsonParserConfiguration;
 
     /**
      * Construct a JSONTokener from a Reader. The caller must close the Reader.
      *
-     * @param reader the source.
+     * @param reader     A reader.
      */
     public JSONTokener(Reader reader) {
-        this(reader, new JSONParserConfiguration());
-    }
-
-    /**
-     * Construct a JSONTokener from a Reader with a given JSONParserConfiguration. The caller must close the Reader.
-     *
-     * @param reader the source.
-     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
-     *
-     */
-    public JSONTokener(Reader reader, JSONParserConfiguration jsonParserConfiguration) {
-        this.jsonParserConfiguration = jsonParserConfiguration;
         this.reader = reader.markSupported()
                 ? reader
                         : new BufferedReader(reader);
@@ -63,62 +53,28 @@ public class JSONTokener {
         this.character = 1;
         this.characterPreviousLine = 0;
         this.line = 1;
+        this.smallCharMemory = new ArrayList(2);
     }
 
+
     /**
      * Construct a JSONTokener from an InputStream. The caller must close the input stream.
      * @param inputStream The source.
      */
     public JSONTokener(InputStream inputStream) {
-        this(inputStream, new JSONParserConfiguration());
-    }
-
-    /**
-     * Construct a JSONTokener from an InputStream. The caller must close the input stream.
-     * @param inputStream The source.
-     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
-     */
-    public JSONTokener(InputStream inputStream, JSONParserConfiguration jsonParserConfiguration) {
-        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")), jsonParserConfiguration);
+        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
     }
 
 
     /**
      * Construct a JSONTokener from a string.
      *
-     * @param source A source string.
+     * @param s     A source string.
      */
-    public JSONTokener(String source) {
-        this(new StringReader(source));
+    public JSONTokener(String s) {
+        this(new StringReader(s));
     }
 
-    /**
-     * Construct a JSONTokener from an InputStream. The caller must close the input stream.
-     * @param source The source.
-     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
-     */
-    public JSONTokener(String source, JSONParserConfiguration jsonParserConfiguration) {
-        this(new StringReader(source), jsonParserConfiguration);
-    }
-
-    /**
-     * Getter
-     * @return jsonParserConfiguration
-     */
-    public JSONParserConfiguration getJsonParserConfiguration() {
-        return jsonParserConfiguration;
-    }
-
-    /**
-     * Setter
-     * @param jsonParserConfiguration new value for jsonParserConfiguration
-     *
-     * @deprecated method should not be used
-     */
-    @Deprecated
-    public void setJsonParserConfiguration(JSONParserConfiguration jsonParserConfiguration) {
-        this.jsonParserConfiguration = jsonParserConfiguration;
-    }
 
     /**
      * Back up one character. This provides a sort of lookahead capability,
@@ -235,6 +191,46 @@ public class JSONTokener {
         return this.previous;
     }
 
+    private void insertCharacterInCharMemory(Character c) {
+        boolean foundSameCharRef = checkForEqualCharRefInMicroCharMemory(c);
+        if(foundSameCharRef){
+            return;
+        }
+
+        if(smallCharMemory.size() < 2){
+            smallCharMemory.add(c);
+            return;
+        }
+
+        smallCharMemory.set(0, smallCharMemory.get(1));
+        smallCharMemory.remove(1);
+        smallCharMemory.add(c);
+    }
+
+    private boolean checkForEqualCharRefInMicroCharMemory(Character c) {
+        boolean isNotEmpty = !smallCharMemory.isEmpty();
+        if (isNotEmpty) {
+            Character lastChar = smallCharMemory.get(smallCharMemory.size() - 1);
+            return c.compareTo(lastChar) == 0;
+        }
+
+        // list is empty so there's no equal characters
+        return false;
+    }
+
+    /**
+     * Retrieves the previous char from memory.
+     *
+     * @return previous char stored in memory.
+     */
+    public char getPreviousChar() {
+        return smallCharMemory.get(0);
+    }
+
+    public int getArrayLevel(){
+        return this.arrayLevel;
+    }
+
     /**
      * Get the last character read from the input or '\0' if nothing has been read yet.
      * @return the last character read from the input.
@@ -312,7 +308,6 @@ public class JSONTokener {
         return new String(chars);
     }
 
-
     /**
      * Get the next char in the string, skipping whitespace.
      * @throws JSONException Thrown if there is an error reading the source string.
@@ -322,6 +317,7 @@ public class JSONTokener {
         for (;;) {
             char c = this.next();
             if (c == 0 || c > ' ') {
+                insertCharacterInCharMemory(c);
                 return c;
             }
         }
@@ -329,15 +325,14 @@ public class JSONTokener {
 
 
     /**
-     * Return the characters up to the next close quote character.
-     * Backslash processing is done. The formal JSON format does not
-     * allow strings in single quotes, but an implementation is allowed to
-     * accept them.
+     * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format
+     * does not allow strings in single quotes, but an implementation is allowed to accept them.
+     *
      * @param quote The quoting character, either
      *      " (double quote) or
      *      ' (single quote).
-     * @return      A String.
-     * @throws JSONException Unterminated string.
+     * @return A String.
+     * @throws JSONException Unterminated string or unbalanced quotes if strictMode == true.
      */
     public String nextString(char quote) throws JSONException {
         char c;
@@ -345,58 +340,59 @@ public class JSONTokener {
         for (;;) {
             c = this.next();
             switch (c) {
-            case 0:
-            case '\n':
-            case '\r':
-                throw this.syntaxError("Unterminated string. " +
+                case 0:
+                case '\n':
+                case '\r':
+                    throw this.syntaxError("Unterminated string. " +
                         "Character with int code " + (int) c + " is not allowed within a quoted string.");
-            case '\\':
-                c = this.next();
-                switch (c) {
-                case 'b':
-                    sb.append('\b');
-                    break;
-                case 't':
-                    sb.append('\t');
-                    break;
-                case 'n':
-                    sb.append('\n');
-                    break;
-                case 'f':
-                    sb.append('\f');
-                    break;
-                case 'r':
-                    sb.append('\r');
-                    break;
-                case 'u':
-                    String next = this.next(4);
-                    try {
-                        sb.append((char)Integer.parseInt(next, 16));
-                    } catch (NumberFormatException e) {
-                        throw this.syntaxError("Illegal escape. " +
-                                "\\u must be followed by a 4 digit hexadecimal number. \\" + next + " is not valid.", e);
+                case '\\':
+                    c = this.next();
+                    switch (c) {
+                        case 'b':
+                            sb.append('\b');
+                            break;
+                        case 't':
+                            sb.append('\t');
+                            break;
+                        case 'n':
+                            sb.append('\n');
+                            break;
+                        case 'f':
+                            sb.append('\f');
+                            break;
+                        case 'r':
+                            sb.append('\r');
+                            break;
+                        case 'u':
+                            String next = this.next(4);
+                            try {
+                                sb.append((char) Integer.parseInt(next, 16));
+                            } catch (NumberFormatException e) {
+                                throw this.syntaxError("Illegal escape. " +
+                                        "\\u must be followed by a 4 digit hexadecimal number. \\" + next
+                                        + " is not valid.",
+                                    e);
+                            }
+                            break;
+                        case '"':
+                        case '\'':
+                        case '\\':
+                        case '/':
+                            sb.append(c);
+                            break;
+                        default:
+                            throw this.syntaxError("Illegal escape. Escape sequence  \\" + c + " is not valid.");
                     }
                     break;
-                case '"':
-                case '\'':
-                case '\\':
-                case '/':
-                    sb.append(c);
-                    break;
                 default:
-                    throw this.syntaxError("Illegal escape. Escape sequence  \\" + c + " is not valid.");
-                }
-                break;
-            default:
-                if (c == quote) {
-                    return sb.toString();
-                }
-                sb.append(c);
+                    if (c == quote) {
+                        return sb.toString();
+                    }
+                    sb.append(c);
             }
         }
     }
 
-
     /**
      * Get the text up but not including the specified character or the
      * end of line, whichever comes first.
@@ -446,57 +442,113 @@ public class JSONTokener {
 
 
     /**
-     * Get the next value. The value can be a Boolean, Double, Integer,
-     * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
-     * @throws JSONException If syntax error.
+     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     * JSONObject.NULL object.
      *
      * @return An object.
+     * @throws JSONException If syntax error.
      */
     public Object nextValue() throws JSONException {
-        char c = this.nextClean();
-        switch (c) {
-        case '{':
-            this.back();
-            try {
-                return new JSONObject(this, jsonParserConfiguration);
-            } catch (StackOverflowError e) {
-                throw new JSONException("JSON Array or Object depth too large to process.", e);
-            }
-        case '[':
-            this.back();
-            try {
-                return new JSONArray(this, jsonParserConfiguration);
-            } catch (StackOverflowError e) {
-                throw new JSONException("JSON Array or Object depth too large to process.", e);
-            }
-        }
-        return nextSimpleValue(c);
+        return nextValue(new JSONParserConfiguration());
     }
 
-    Object nextSimpleValue(char c) {
-        String string;
-
-        // Strict mode only allows strings with explicit double quotes
-        if (jsonParserConfiguration != null &&
-                jsonParserConfiguration.isStrictMode() &&
-                c == '\'') {
-            throw this.syntaxError("Strict mode error: Single quoted strings are not allowed");
-        }
+    /**
+     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     * JSONObject.NULL object. The strictMode parameter controls the behavior of the method when parsing the value.
+     *
+     * @param jsonParserConfiguration which carries options such as strictMode, these methods will
+     *                                strictly adhere to the JSON syntax, throwing a JSONException for any deviations.
+     * @return An object.
+     * @throws JSONException If syntax error.
+     */
+    public Object nextValue(JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+        char c = this.nextClean();
         switch (c) {
-        case '"':
-        case '\'':
+            case '{':
+                this.back();
+                try {
+                    return new JSONObject(this, jsonParserConfiguration);
+                } catch (StackOverflowError e) {
+                    throw new JSONException("JSON Array or Object depth too large to process.", e);
+                }
+            case '[':
+                this.back();
+                try {
+                    this.arrayLevel++;
+                    return new JSONArray(this, jsonParserConfiguration);
+                } catch (StackOverflowError e) {
+                    throw new JSONException("JSON Array or Object depth too large to process.", e);
+                }
+            default:
+                return nextSimpleValue(c, jsonParserConfiguration);
+        }
+    }
+
+    /**
+     * This method is used to get a JSONObject from the JSONTokener. The strictMode parameter controls the behavior of
+     * the method when parsing the JSONObject.
+     *
+     * @param jsonParserConfiguration which carries options such as strictMode, these methods will
+     *                                strictly adhere to the JSON syntax, throwing a JSONException for any deviations.
+     *                                deviations.
+     * @return A JSONObject which is the next value in the JSONTokener.
+     * @throws JSONException If the JSONObject or JSONArray depth is too large to process.
+     */
+    private JSONObject getJsonObject(JSONParserConfiguration jsonParserConfiguration) {
+        try {
+            return new JSONObject(this, jsonParserConfiguration);
+        } catch (StackOverflowError e) {
+            throw new JSONException("JSON Array or Object depth too large to process.", e);
+        }
+    }
+
+    /**
+     * This method is used to get a JSONArray from the JSONTokener.
+     *
+     * @return A JSONArray which is the next value in the JSONTokener.
+     * @throws JSONException If the JSONArray depth is too large to process.
+     */
+    private JSONArray getJsonArray() {
+        try {
+            return new JSONArray(this);
+        } catch (StackOverflowError e) {
+            throw new JSONException("JSON Array or Object depth too large to process.", e);
+        }
+    }
+
+    /**
+     * Get the next simple value from the JSON input. Simple values include strings (wrapped in single or double
+     * quotes), numbers, booleans, and null. This method is called when the next character is not '{' or '['.
+     *
+     * @param c                       The starting character.
+     * @param jsonParserConfiguration The configuration object containing parsing options.
+     * @return The parsed simple value.
+     * @throws JSONException If there is a syntax error or the value does not adhere to the configuration rules.
+     */
+    Object nextSimpleValue(char c, JSONParserConfiguration jsonParserConfiguration) {
+        boolean strictMode = jsonParserConfiguration.isStrictMode();
+
+        if (strictMode && c == '\'') {
+            throw this.syntaxError("Single quote wrap not allowed in strict mode");
+        }
+
+        if (c == '"' || c == '\'') {
             return this.nextString(c);
         }
 
-        /*
-         * Handle unquoted text. This could be the values true, false, or
-         * null, or it can be a number. An implementation (such as this one)
-         * is allowed to also accept non-standard forms.
-         *
-         * Accumulate characters until we reach the end of the text or a
-         * formatting character.
-         */
+        return parsedUnquotedText(c, strictMode);
+    }
 
+    /**
+     * Parses unquoted text from the JSON input. This could be the values true, false, or null, or it can be a number.
+     * Non-standard forms are also accepted. Characters are accumulated until the end of the text or a formatting
+     * character is reached.
+     *
+     * @param c The starting character.
+     * @return The parsed object.
+     * @throws JSONException If the parsed string is empty.
+     */
+    private Object parsedUnquotedText(char c, boolean strictMode) {
         StringBuilder sb = new StringBuilder();
         while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
             sb.append(c);
@@ -506,20 +558,24 @@ public class JSONTokener {
             this.back();
         }
 
-        string = sb.toString().trim();
-        if ("".equals(string)) {
+        String string = sb.toString().trim();
+
+        if (string.isEmpty()) {
             throw this.syntaxError("Missing value");
         }
-        Object obj = JSONObject.stringToValue(string);
-        // Strict mode only allows strings with explicit double quotes
-        if (jsonParserConfiguration != null &&
-                jsonParserConfiguration.isStrictMode() &&
-                obj instanceof String) {
-            throw this.syntaxError(String.format("Strict mode error: Value '%s' is not surrounded by quotes", obj));
-        }
-        return obj;
+
+        Object stringToValue = JSONObject.stringToValue(string);
+
+        return strictMode ? getValidNumberBooleanOrNullFromObject(stringToValue) : stringToValue;
     }
 
+    private Object getValidNumberBooleanOrNullFromObject(Object value) {
+        if (value instanceof Number || value instanceof Boolean || value.equals(JSONObject.NULL)) {
+            return value;
+        }
+
+        throw this.syntaxError(String.format("Value '%s' is not surrounded by quotes", value));
+    }
 
     /**
      * Skip characters until the next character is the requested character.
diff --git a/src/main/java/org/json/JSONWriter.java b/src/main/java/org/json/compat/JSONWriter.java
similarity index 99%
rename from src/main/java/org/json/JSONWriter.java
rename to src/main/java/org/json/compat/JSONWriter.java
index 11f4a5c..c351466 100644
--- a/src/main/java/org/json/JSONWriter.java
+++ b/src/main/java/org/json/compat/JSONWriter.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/org/json/compat/ParserConfiguration.java
similarity index 99%
rename from src/main/java/org/json/ParserConfiguration.java
rename to src/main/java/org/json/compat/ParserConfiguration.java
index 06cc443..3a57c26 100644
--- a/src/main/java/org/json/ParserConfiguration.java
+++ b/src/main/java/org/json/compat/ParserConfiguration.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 /*
 Public Domain.
 */
diff --git a/src/main/java/org/json/Property.java b/src/main/java/org/json/compat/Property.java
similarity index 98%
rename from src/main/java/org/json/Property.java
rename to src/main/java/org/json/compat/Property.java
index ba6c569..24b45d2 100644
--- a/src/main/java/org/json/Property.java
+++ b/src/main/java/org/json/compat/Property.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/StringBuilderWriter.java b/src/main/java/org/json/compat/StringBuilderWriter.java
similarity index 98%
rename from src/main/java/org/json/StringBuilderWriter.java
rename to src/main/java/org/json/compat/StringBuilderWriter.java
index 4aaa490..4666414 100644
--- a/src/main/java/org/json/StringBuilderWriter.java
+++ b/src/main/java/org/json/compat/StringBuilderWriter.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/compat/XML.java
similarity index 87%
rename from src/main/java/org/json/XML.java
rename to src/main/java/org/json/compat/XML.java
index 4bf4759..72b7d52 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/compat/XML.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
@@ -355,20 +355,10 @@ public class XML {
                                 && TYPE_ATTR.equals(string)) {
                             xmlXsiTypeConverter = config.getXsiTypeMap().get(token);
                         } else if (!nilAttributeFound) {
-                            Object obj = stringToValue((String) token);
-                            if (obj instanceof Boolean) {
-                                jsonObject.accumulate(string,
-                                        config.isKeepBooleanAsString()
-                                                ? ((String) token)
-                                                : obj);
-                            } else if (obj instanceof Number) {
-                                jsonObject.accumulate(string,
-                                        config.isKeepNumberAsString()
-                                                ? ((String) token)
-                                                : obj);
-                            } else {
-                                jsonObject.accumulate(string, stringToValue((String) token));
-                            }
+                            jsonObject.accumulate(string,
+                                    config.isKeepStrings()
+                                            ? ((String) token)
+                                            : stringToValue((String) token));
                         }
                         token = null;
                     } else {
@@ -417,20 +407,8 @@ public class XML {
                                     jsonObject.accumulate(config.getcDataTagName(),
                                             stringToValue(string, xmlXsiTypeConverter));
                                 } else {
-                                    Object obj = stringToValue((String) token);
-                                    if (obj instanceof Boolean) {
-                                        jsonObject.accumulate(config.getcDataTagName(),
-                                                config.isKeepBooleanAsString()
-                                                        ? ((String) token)
-                                                        : obj);
-                                    } else if (obj instanceof Number) {
-                                        jsonObject.accumulate(config.getcDataTagName(),
-                                                config.isKeepNumberAsString()
-                                                        ? ((String) token)
-                                                        : obj);
-                                    } else {
-                                        jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token));
-                                    }
+                                    jsonObject.accumulate(config.getcDataTagName(),
+                                            config.isKeepStrings() ? string : stringToValue(string));
                                 }
                             }
 
@@ -710,44 +688,6 @@ public class XML {
         return toJSONObject(reader, XMLParserConfiguration.ORIGINAL);
     }
 
-    /**
-     * Convert a well-formed (but not necessarily valid) XML into a
-     * JSONObject. Some information may be lost in this transformation because
-     * JSON is a data format and XML is a document format. XML uses elements,
-     * attributes, and content text, while JSON uses unordered collections of
-     * name/value pairs and arrays of values. JSON does not does not like to
-     * distinguish between elements and attributes. Sequences of similar
-     * elements are represented as JSONArrays. Content text may be placed in a
-     * "content" member. Comments, prologs, DTDs, and 
{@code
-     * <[ [ ]]>}

-     * are ignored.
-     *
-     * All numbers are converted as strings, for 1, 01, 29.0 will not be coerced to
-     * numbers but will instead be the exact value as seen in the XML document depending
-     * on how flag is set.
-     * All booleans are converted as strings, for true, false will not be coerced to
-     * booleans but will instead be the exact value as seen in the XML document depending
-     * on how flag is set.
-     *
-     * @param reader The XML source reader.
-     * @param keepNumberAsString If true, then numeric values will not be coerced into
-     *  numeric values and will instead be left as strings
-     * @param keepBooleanAsString If true, then boolean values will not be coerced into
-     *      *  numeric values and will instead be left as strings
-     * @return A JSONObject containing the structured data from the XML string.
-     * @throws JSONException Thrown if there is an errors while parsing the string
-     */
-    public static JSONObject toJSONObject(Reader reader, boolean keepNumberAsString, boolean keepBooleanAsString) throws JSONException {
-        XMLParserConfiguration xmlParserConfiguration = new XMLParserConfiguration();
-        if(keepNumberAsString) {
-            xmlParserConfiguration = xmlParserConfiguration.withKeepNumberAsString(keepNumberAsString);
-        }
-        if(keepBooleanAsString) {
-            xmlParserConfiguration = xmlParserConfiguration.withKeepBooleanAsString(keepBooleanAsString);
-        }
-        return toJSONObject(reader, xmlParserConfiguration);
-    }
-
     /**
      * Convert a well-formed (but not necessarily valid) XML into a
      * JSONObject. Some information may be lost in this transformation because
@@ -806,38 +746,6 @@ public class XML {
         return toJSONObject(new StringReader(string), keepStrings);
     }
 
-    /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject. Some information may be lost in this transformation because
-     * JSON is a data format and XML is a document format. XML uses elements,
-     * attributes, and content text, while JSON uses unordered collections of
-     * name/value pairs and arrays of values. JSON does not does not like to
-     * distinguish between elements and attributes. Sequences of similar
-     * elements are represented as JSONArrays. Content text may be placed in a
-     * "content" member. Comments, prologs, DTDs, and 
{@code
-     * <[ [ ]]>}

-     * are ignored.
-     *
-     * All numbers are converted as strings, for 1, 01, 29.0 will not be coerced to
-     * numbers but will instead be the exact value as seen in the XML document depending
-     * on how flag is set.
-     * All booleans are converted as strings, for true, false will not be coerced to
-     * booleans but will instead be the exact value as seen in the XML document depending
-     * on how flag is set.
-     *
-     * @param string
-     *            The source string.
-     * @param keepNumberAsString If true, then numeric values will not be coerced into
-     *  numeric values and will instead be left as strings
-     * @param keepBooleanAsString If true, then boolean values will not be coerced into
-     *  numeric values and will instead be left as strings
-     * @return A JSONObject containing the structured data from the XML string.
-     * @throws JSONException Thrown if there is an errors while parsing the string
-     */
-    public static JSONObject toJSONObject(String string, boolean keepNumberAsString, boolean keepBooleanAsString) throws JSONException {
-        return toJSONObject(new StringReader(string), keepNumberAsString, keepBooleanAsString);
-    }
-
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject. Some information may be lost in this transformation because
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/compat/XMLParserConfiguration.java
similarity index 83%
rename from src/main/java/org/json/XMLParserConfiguration.java
rename to src/main/java/org/json/compat/XMLParserConfiguration.java
index de84b90..f238a0b 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/compat/XMLParserConfiguration.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 /*
 Public Domain.
 */
@@ -22,16 +22,6 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
 //    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512; // We could override
 
-    /**
-     * Allow user to control how numbers are parsed
-     */
-    private boolean keepNumberAsString;
-
-    /**
-     * Allow user to control how booleans are parsed
-     */
-    private boolean keepBooleanAsString;
-
     /** Original Configuration of the XML Parser. */
     public static final XMLParserConfiguration ORIGINAL
         = new XMLParserConfiguration();
@@ -152,9 +142,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
     @Deprecated
     public XMLParserConfiguration (final boolean keepStrings, final String cDataTagName, final boolean convertNilAttributeToNull) {
-        super(false, DEFAULT_MAXIMUM_NESTING_DEPTH);
-        this.keepNumberAsString = keepStrings;
-        this.keepBooleanAsString = keepStrings;
+        super(keepStrings, DEFAULT_MAXIMUM_NESTING_DEPTH);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
     }
@@ -175,10 +163,8 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
             final boolean convertNilAttributeToNull, final Map> xsiTypeMap, final Set forceList,
-            final int maxNestingDepth, final boolean closeEmptyTag, final boolean keepNumberAsString, final boolean keepBooleanAsString) {
-        super(false, maxNestingDepth);
-        this.keepNumberAsString = keepNumberAsString;
-        this.keepBooleanAsString = keepBooleanAsString;
+            final int maxNestingDepth, final boolean closeEmptyTag) {
+        super(keepStrings, maxNestingDepth);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
@@ -203,9 +189,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
                 this.xsiTypeMap,
                 this.forceList,
                 this.maxNestingDepth,
-                this.closeEmptyTag,
-                this.keepNumberAsString,
-                this.keepBooleanAsString
+                this.closeEmptyTag
         );
         config.shouldTrimWhiteSpace = this.shouldTrimWhiteSpace;
         return config;
@@ -223,43 +207,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
     @SuppressWarnings("unchecked")
     @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
-        XMLParserConfiguration newConfig = this.clone();
-        newConfig.keepStrings = newVal;
-        newConfig.keepNumberAsString = newVal;
-        newConfig.keepBooleanAsString = newVal;
-        return newConfig;
-    }
-
-    /**
-     * When parsing the XML into JSON, specifies if numbers should be kept as strings (1), or if
-     * they should try to be guessed into JSON values (numeric, boolean, string)
-     *
-     * @param newVal
-     *      new value to use for the keepNumberAsString configuration option.
-     *
-     * @return The existing configuration will not be modified. A new configuration is returned.
-     */
-    public XMLParserConfiguration withKeepNumberAsString(final boolean newVal) {
-        XMLParserConfiguration newConfig = this.clone();
-        newConfig.keepNumberAsString = newVal;
-        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
-        return newConfig;
-    }
-
-    /**
-     * When parsing the XML into JSON, specifies if booleans should be kept as strings (true), or if
-     * they should try to be guessed into JSON values (numeric, boolean, string)
-     *
-     * @param newVal
-     *      new value to use for the withKeepBooleanAsString configuration option.
-     *
-     * @return The existing configuration will not be modified. A new configuration is returned.
-     */
-    public XMLParserConfiguration withKeepBooleanAsString(final boolean newVal) {
-        XMLParserConfiguration newConfig = this.clone();
-        newConfig.keepBooleanAsString = newVal;
-        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
-        return newConfig;
+        return super.withKeepStrings(newVal);
     }
 
     /**
@@ -273,26 +221,6 @@ public class XMLParserConfiguration extends ParserConfiguration {
         return this.cDataTagName;
     }
 
-    /**
-     * When parsing the XML into JSONML, specifies if numbers should be kept as strings (true), or if
-     * they should try to be guessed into JSON values (numeric, boolean, string).
-     *
-     * @return The keepStrings configuration value.
-     */
-    public boolean isKeepNumberAsString() {
-        return this.keepNumberAsString;
-    }
-
-    /**
-     * When parsing the XML into JSONML, specifies if booleans should be kept as strings (true), or if
-     * they should try to be guessed into JSON values (numeric, boolean, string).
-     *
-     * @return The keepStrings configuration value.
-     */
-    public boolean isKeepBooleanAsString() {
-        return this.keepBooleanAsString;
-    }
-
     /**
      * The name of the key in a JSON Object that indicates a CDATA section. Historically this has
      * been the value "content" but can be changed. Use null to indicate no CDATA
diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/compat/XMLTokener.java
similarity index 99%
rename from src/main/java/org/json/XMLTokener.java
rename to src/main/java/org/json/compat/XMLTokener.java
index bc18b31..13851c4 100644
--- a/src/main/java/org/json/XMLTokener.java
+++ b/src/main/java/org/json/compat/XMLTokener.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 
 /*
 Public Domain.
diff --git a/src/main/java/org/json/XMLXsiTypeConverter.java b/src/main/java/org/json/compat/XMLXsiTypeConverter.java
similarity index 98%
rename from src/main/java/org/json/XMLXsiTypeConverter.java
rename to src/main/java/org/json/compat/XMLXsiTypeConverter.java
index ea6739d..addd329 100644
--- a/src/main/java/org/json/XMLXsiTypeConverter.java
+++ b/src/main/java/org/json/compat/XMLXsiTypeConverter.java
@@ -1,4 +1,4 @@
-package org.json;
+package org.json.compat;
 /*
 Public Domain.
 */
diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
deleted file mode 100644
index e5eb9ed..0000000
--- a/src/test/java/org/json/junit/CDLTest.java
+++ /dev/null
@@ -1,392 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONArray;
-import org.json.CDL;
-
-/**
- * Tests for CDL.java.
- * CDL provides an application level API, but it is not used by the
- * reference app. To test it, strings will be converted to JSON-Java classes
- * and then converted back.
- */
-public class CDLTest {
-
-    /**
-     * String of lines where the column names are in the first row,
-     * and all subsequent rows are values. All keys and values should be legal.
-     */
-    private static final String LINES = "Col 1, Col 2,  \tCol 3, Col 4, Col 5, Col 6, Col 7\n" +
-			"val1, val2, val3, val4, val5, val6, val7\n" +
-			"1, 2, 3, 4\t, 5, 6, 7\n" +
-			"true, false, true, true, false, false, false\n" +
-			"0.23, 57.42, 5e27, -234.879, 2.34e5, 0.0, 9e-3\n" +
-			"\"va\tl1\", \"v\bal2\", \"val3\", \"val\f4\", \"val5\", \"va'l6\", val7\n";
-
-
-    /**
-     * CDL.toJSONArray() adds all values as strings, with no filtering or 
-     * conversions. For testing, this means that the expected JSONObject 
-     * values all must be quoted in the cases where the JSONObject parsing 
-     * might normally convert the value into a non-string. 
-     */
-    private static final String EXPECTED_LINES =
-            "[  " +
-                "{" +
-                    "\"Col 1\":\"val1\", " +
-                    "\"Col 2\":\"val2\", " +
-                    "\"Col 3\":\"val3\", " +
-                    "\"Col 4\":\"val4\", " +
-                    "\"Col 5\":\"val5\", " +
-                    "\"Col 6\":\"val6\", " +
-                    "\"Col 7\":\"val7\"" +
-                "}, " +
-			"   {" +
-                    "\"Col 1\":\"1\", " +
-                    "\"Col 2\":\"2\", " +
-                    "\"Col 3\":\"3\", " +
-                    "\"Col 4\":\"4\", " +
-                    "\"Col 5\":\"5\", " +
-                    "\"Col 6\":\"6\", " +
-                    "\"Col 7\":\"7\"" +
-                "}, " +
-			"   {" +
-                    "\"Col 1\":\"true\", " +
-                    "\"Col 2\":\"false\", " +
-                    "\"Col 3\":\"true\", " +
-                    "\"Col 4\":\"true\", " +
-                    "\"Col 5\":\"false\", " +
-                    "\"Col 6\":\"false\", " +
-                    "\"Col 7\":\"false\"" +
-                "}, " +
-			    "{" +
-                    "\"Col 1\":\"0.23\", " +
-                    "\"Col 2\":\"57.42\", " +
-                    "\"Col 3\":\"5e27\", " +
-                    "\"Col 4\":\"-234.879\", " +
-                    "\"Col 5\":\"2.34e5\", " +
-                    "\"Col 6\":\"0.0\", " +
-                    "\"Col 7\":\"9e-3\"" +
-                "}, " +
-			    "{" +
-                    "\"Col 1\":\"va\tl1\", " +
-                    "\"Col 2\":\"v\bal2\", " +
-                    "\"Col 3\":\"val3\", " +
-                    "\"Col 4\":\"val\f4\", " +
-                    "\"Col 5\":\"val5\", " +
-                    "\"Col 6\":\"va'l6\", " +
-                    "\"Col 7\":\"val7\"" +
-                "}" +
-            "]";
-
-    /**
-     * Attempts to create a JSONArray from a null string.
-     * Expect a NullPointerException.
-     */
-    @Test(expected=NullPointerException.class)
-    public void exceptionOnNullString() {
-        String nullStr = null;
-        CDL.toJSONArray(nullStr);
-    }
-
-    /**
-     * Attempts to create a JSONArray from a string with unbalanced quotes
-     * in column title line. Expects a JSONException.
-     */
-    @Test
-    public void unbalancedQuoteInName() {
-        String badLine = "Col1, \"Col2\nVal1, Val2";
-        try {
-            CDL.toJSONArray(badLine);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Missing close quote '\"'. at 12 [character 0 line 2]",
-                    e.getMessage());
-        }
-    }
-    
-    /**
-     * Attempts to create a JSONArray from a string with unbalanced quotes
-     * in value line. Expects a JSONException.
-     */
-    @Test
-    public void unbalancedQuoteInValue() {
-        String badLine = "Col1, Col2\n\"Val1, Val2";
-        try {
-            CDL.toJSONArray(badLine);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Missing close quote '\"'. at 22 [character 11 line 2]",
-                    e.getMessage());
-            
-        }
-    }
-
-    /**
-     * Attempts to create a JSONArray from a string with null char
-     * in column title line. Expects a JSONException.
-     */
-    @Test
-    public void nullInName() {
-        String badLine = "C\0ol1, Col2\nVal1, Val2";
-        try {
-            CDL.toJSONArray(badLine);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Bad character 'o' (111). at 2 [character 3 line 1]",
-                    e.getMessage());
-            
-        }
-    }
-    
-    /**
-     * Attempt to create a JSONArray with unbalanced quotes and a properly escaped doubled quote.
-     * Expects a JSONException. 
-     */
-    @Test
-    public void unbalancedEscapedQuote(){
-    	   String badLine = "Col1, Col2\n\"Val1, \"\"Val2\"\"";
-           try {
-               CDL.toJSONArray(badLine);
-               fail("Expecting an exception");
-           } catch (JSONException e) {
-               assertEquals("Expecting an exception message",
-                       "Missing close quote '\"'. at 26 [character 15 line 2]",
-                       e.getMessage());
-               
-           }
-    }
-
-    /**
-     * Csv parsing skip last row if last field of this row is empty #943
-     */
-    @Test
-    public void csvParsingCatchesLastRow(){
-        String data = "Field 1,Field 2,Field 3\n" +
-                "value11,value12,\n" +
-                "value21,value22,";
-
-        JSONArray jsonArray = CDL.toJSONArray(data);
-
-        JSONArray expectedJsonArray = new JSONArray();
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("Field 1", "value11");
-        jsonObject.put("Field 2", "value12");
-        jsonObject.put("Field 3", "");
-        expectedJsonArray.put(jsonObject);
-
-        jsonObject = new JSONObject();
-        jsonObject.put("Field 1", "value21");
-        jsonObject.put("Field 2", "value22");
-        jsonObject.put("Field 3", "");
-        expectedJsonArray.put(jsonObject);
-
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-    }
-
-    /**
-     * Assert that there is no error for a single escaped quote within a properly embedded quote.
-     */
-    @Test
-    public void singleEscapedQuote(){
-               String singleEscape = "Col1, Col2\nVal1, \"\"\"Val2\"";
-               JSONArray jsonArray = CDL.toJSONArray(singleEscape);
-               
-               String cdlStr = CDL.toString(jsonArray);
-               assertTrue(cdlStr.contains("Col1"));
-               assertTrue(cdlStr.contains("Col2"));
-               assertTrue(cdlStr.contains("Val1"));
-               assertTrue(cdlStr.contains("\"Val2"));
-    }
-    
-    /**
-     * Assert that there is no error for a single escaped quote within a properly
-     * embedded quote when not the last value.
-     */
-    @Test
-    public void singleEscapedQuoteMiddleString(){
-               String singleEscape = "Col1, Col2\nVal1, \"\"\"Val2\"\nVal 3,Val 4";
-               JSONArray jsonArray = CDL.toJSONArray(singleEscape);
-               
-               String cdlStr = CDL.toString(jsonArray);
-               assertTrue(cdlStr.contains("Col1"));
-               assertTrue(cdlStr.contains("Col2"));
-               assertTrue(cdlStr.contains("Val1"));
-               assertTrue(cdlStr.contains("\"Val2"));
-    }
-    
-    /**
-     * Attempt to create a JSONArray with an escape quote and no enclosing quotes.
-     * Expects a JSONException. 
-     */
-    @Test
-    public void badEscapedQuote(){
-    	       String badLine = "Col1, Col2\nVal1, \"\"Val2";
-    	       
-    	       try {
-                   CDL.toJSONArray(badLine);
-                   fail("Expecting an exception");
-               } catch (JSONException e) {
-            	   //System.out.println("Message" + e.getMessage());
-                   assertEquals("Expecting an exception message",
-                           "Bad character 'V' (86). at 20 [character 9 line 2]",
-                           e.getMessage());
-                   
-               }
-               
-    }
-    
-    /**
-     * call toString with a null array
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullJSONArrayToString() {
-        CDL.toString((JSONArray)null);
-    }
-
-    /**
-     * Create a JSONArray from an empty string
-     */
-    @Test
-    public void emptyString() {
-        String emptyStr = "";
-        JSONArray jsonArray = CDL.toJSONArray(emptyStr);
-		assertNull("CDL should return null when the input string is empty", jsonArray);
-    }
-
-    /**
-     * Create a JSONArray with only 1 row
-     */
-    @Test
-    public void onlyColumnNames() {
-        String columnNameStr = "col1, col2, col3";
-        JSONArray jsonArray = CDL.toJSONArray(columnNameStr);
-        assertNull("CDL should return null when only 1 row is given",
-                jsonArray);
-    }
-
-    /**
-     * Create a JSONArray from string containing only whitespace and commas
-     */
-    @Test
-    public void emptyLinesToJSONArray() {
-        String str = " , , , \n , , , ";
-        JSONArray jsonArray = CDL.toJSONArray(str);
-        assertNull("JSONArray should be null for no content",
-                jsonArray);
-    }
-
-    /**
-     * call toString with a null array
-     */
-    @Test
-    public void emptyJSONArrayToString() {
-        JSONArray jsonArray = new JSONArray();
-        String str = CDL.toString(jsonArray);
-        assertNull("CDL should return null for toString(null)",
-                str);
-    }
-
-    /**
-     * call toString with a null arrays for names and values
-     */
-    @Test
-    public void nullJSONArraysToString() {
-        String str = CDL.toString(null, null);
-        assertNull("CDL should return null for toString(null)",
-                str);
-    }
-
-    /**
-     * Given a JSONArray that was not built by CDL, some chars may be
-     * found that would otherwise be filtered out by CDL.
-     */
-    @Test
-    public void checkSpecialChars() {
-        JSONArray jsonArray = new JSONArray();
-        JSONObject jsonObject = new JSONObject();
-        jsonArray.put(jsonObject);
-        // \r will be filtered from name
-        jsonObject.put("Col \r1", "V1");
-        // \r will be filtered from value
-        jsonObject.put("Col 2", "V2\r");
-		assertEquals("expected length should be 1", 1, jsonArray.length());
-        String cdlStr = CDL.toString(jsonArray);
-        jsonObject = jsonArray.getJSONObject(0);
-        assertTrue(cdlStr.contains("\"Col 1\""));
-        assertTrue(cdlStr.contains("Col 2"));
-        assertTrue(cdlStr.contains("V1"));
-        assertTrue(cdlStr.contains("\"V2\""));
-    }
-
-    /**
-     * Create a JSONArray from a string of lines
-     */
-    @Test
-    public void textToJSONArray() {
-        JSONArray jsonArray = CDL.toJSONArray(LINES);
-        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-    }
-    @Test
-    public void textToJSONArrayPipeDelimited() {
-        char delimiter = '|';
-        JSONArray jsonArray = CDL.toJSONArray(LINES.replaceAll(",", String.valueOf(delimiter)), delimiter);
-        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-    }
-
-    /**
-     * Create a JSONArray from a JSONArray of titles and a 
-     * string of value lines
-     */
-    @Test
-    public void jsonArrayToJSONArray() {
-        String nameArrayStr = "[\"Col1\", \"Col2\"]";
-        String values = "V1, V2";
-        JSONArray nameJSONArray = new JSONArray(nameArrayStr);
-        JSONArray jsonArray = CDL.toJSONArray(nameJSONArray, values);
-        JSONArray expectedJsonArray = new JSONArray("[{\"Col1\":\"V1\",\"Col2\":\"V2\"}]");
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-    }
-
-    /**
-     * Create a JSONArray from a string of lines,
-     * then convert to string and then back to JSONArray
-     */
-    @Test
-    public void textToJSONArrayAndBackToString() {
-        JSONArray jsonArray = CDL.toJSONArray(LINES);
-        String jsonStr = CDL.toString(jsonArray);
-        JSONArray finalJsonArray = CDL.toJSONArray(jsonStr);
-        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
-        Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
-    }
-
-    /**
-     * Create a JSONArray from a string of lines,
-     * then convert to string and then back to JSONArray
-     * with a custom delimiter
-     */
-    @Test
-    public void textToJSONArrayAndBackToStringCustomDelimiter() {
-        JSONArray jsonArray = CDL.toJSONArray(LINES, ',');
-        String jsonStr = CDL.toString(jsonArray, ';');
-        JSONArray finalJsonArray = CDL.toJSONArray(jsonStr, ';');
-        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
-        Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
-    }
-    
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/CookieListTest.java b/src/test/java/org/json/junit/CookieListTest.java
deleted file mode 100644
index 0af9640..0000000
--- a/src/test/java/org/json/junit/CookieListTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.json.*;
-import org.junit.Test;
-
-import com.jayway.jsonpath.*;
-
-/**
- * HTTP cookie specification RFC6265: http://tools.ietf.org/html/rfc6265
- * 

- * A cookie list is a JSONObject whose members are presumed to be cookie
- * name/value pairs. Entries are unescaped while being added, and escaped in 
- * the toString() output.
- * Unescaping means to convert %hh hex strings to the ascii equivalent
- * and converting '+' to ' '.
- * Escaping converts '+', '%', '=', ';' and ascii control chars to %hh hex strings.
- * 

- * CookieList should not be considered as just a list of Cookie objects:

- * - CookieList stores a cookie name/value pair as a single entry; Cookie stores 
- *      it as 2 entries (key="name" and key="value").

- * - CookieList requires multiple name/value pairs as input; Cookie allows the
- *      'secure' name with no associated value

- * - CookieList has no special handling for attribute name/value pairs.

- */
-public class CookieListTest {
-
-    /**
-     * Attempts to create a CookieList from a null string.
-     * Expects a NullPointerException.
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullCookieListException() {
-        String cookieStr = null;
-        CookieList.toJSONObject(cookieStr);
-    }
-
-    /**
-     * Attempts to create a CookieList from a malformed string.
-     * Expects a JSONException.
-     */
-    @Test
-    public void malFormedCookieListException() {
-        String cookieStr = "thisCookieHasNoEqualsChar";
-        try {
-            CookieList.toJSONObject(cookieStr);
-            fail("should throw an exception");
-        } catch (JSONException e) {
-            /**
-             * Not sure of the missing char, but full string compare fails 
-             */
-            assertEquals("Expecting an exception message",
-                    "Expected '=' and instead saw '' at 25 [character 26 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a CookieList from an empty string.
-     */
-    @Test
-    public void emptyStringCookieList() {
-        String cookieStr = "";
-        JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
-        assertTrue(jsonObject.isEmpty());
-    }
-
-    /**
-     * CookieList with the simplest cookie - a name/value pair with no delimiter.
-     */
-    @Test
-    public void simpleCookieList() {
-        String cookieStr = "SID=31d4d96e407aad42";
-        JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("Expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(jsonObject.query("/SID")));
-    }
-
-    /**
-     * CookieList with a single a cookie which has a name/value pair and delimiter.
-     */
-    @Test
-    public void simpleCookieListWithDelimiter() {
-        String cookieStr = "SID=31d4d96e407aad42;";
-        JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("Expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(jsonObject.query("/SID")));
-    }
-
-    /**
-     * CookieList with multiple cookies consisting of name/value pairs
-     * with delimiters.
-     */
-    @Test
-    public void multiPartCookieList() {
-        String cookieStr = 
-            "name1=myCookieValue1;  "+
-            "  name2=myCookieValue2;"+
-            "name3=myCookieValue3;"+
-            "  name4=myCookieValue4;  "+
-            "name5=myCookieValue5;"+
-            "  name6=myCookieValue6;";
-        JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("Expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1")));
-        assertTrue("expected myCookieValue2", "myCookieValue2".equals(jsonObject.query("/name2")));
-        assertTrue("expected myCookieValue3", "myCookieValue3".equals(jsonObject.query("/name3")));
-        assertTrue("expected myCookieValue4", "myCookieValue4".equals(jsonObject.query("/name4")));
-        assertTrue("expected myCookieValue5", "myCookieValue5".equals(jsonObject.query("/name5")));
-        assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6")));
-    }
-
-    /**
-     * CookieList from a JSONObject with valid key and null value
-     */
-    @Test
-    public void convertCookieListWithNullValueToString() {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("key",  JSONObject.NULL);
-        String cookieToStr = CookieList.toString(jsonObject);
-        assertTrue("toString() should be empty", "".equals(cookieToStr));
-    }
-
-    /**
-     * CookieList with multiple entries converted to a JSON document. 
-     */
-    @Test
-    public void convertCookieListToString() {
-        String cookieStr = 
-                "name1=myCookieValue1;  "+
-                "  name2=myCookieValue2;"+
-                "name3=myCookieValue3;"+
-                "  name4=myCookieValue4;  "+
-                "name5=myCookieValue5;"+
-                "  name6=myCookieValue6;";
-        JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
-        // exercise CookieList.toString()
-        String cookieListString = CookieList.toString(jsonObject);
-        // have to convert it back for validation
-        jsonObject = CookieList.toJSONObject(cookieListString);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("Expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1")));
-        assertTrue("expected myCookieValue2", "myCookieValue2".equals(jsonObject.query("/name2")));
-        assertTrue("expected myCookieValue3", "myCookieValue3".equals(jsonObject.query("/name3")));
-        assertTrue("expected myCookieValue4", "myCookieValue4".equals(jsonObject.query("/name4")));
-        assertTrue("expected myCookieValue5", "myCookieValue5".equals(jsonObject.query("/name5")));
-        assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6")));
-    }
-
-    /**
-     * CookieList with multiple entries and some '+' chars and URL-encoded
-     * values converted to a JSON document. 
-     */
-    @Test   
-    public void convertEncodedCookieListToString() {
-        String cookieStr = 
-                "name1=myCookieValue1;  "+
-                "  name2=my+Cookie+Value+2;"+
-                "name3=my%2BCookie%26Value%3B3%3D;"+
-                "  name4=my%25CookieValue4;  "+
-                "name5=myCookieValue5;"+
-                "  name6=myCookieValue6;";
-        JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("Expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1")));
-        assertTrue("expected my Cookie Value 2", "my Cookie Value 2".equals(jsonObject.query("/name2")));
-        assertTrue("expected my+Cookie&Value;3=", "my+Cookie&Value;3=".equals(jsonObject.query("/name3")));
-        assertTrue("expected my%CookieValue4", "my%CookieValue4".equals(jsonObject.query("/name4")));
-        assertTrue("expected my%CookieValue5", "myCookieValue5".equals(jsonObject.query("/name5")));
-        assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6")));
-    }
-}
diff --git a/src/test/java/org/json/junit/CookieTest.java b/src/test/java/org/json/junit/CookieTest.java
deleted file mode 100644
index edd8a7e..0000000
--- a/src/test/java/org/json/junit/CookieTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import org.json.*;
-import org.junit.Test;
-
-
-/**
- * HTTP cookie specification: RFC6265
- * 

- * At its most basic, a cookie is a name=value pair. The value may be subdivided
- * into other cookies, but that is not tested here. The cookie may also include
- * certain named attributes, delimited by semicolons. 
- * 

- * The Cookie.toString() method emits certain attributes if present: expires,
- * domain, path, secure. All but secure are name-value pairs. Other attributes
- * are not included in the toString() output.
- * 

- * A JSON-Java encoded cookie escapes '+', '%', '=', ';' with %hh values.
- */
-public class CookieTest {
-
-    /**
-     * Attempts to create a JSONObject from a null string.
-     * Expects a NullPointerException.
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullCookieException() {
-        String cookieStr = null;
-        Cookie.toJSONObject(cookieStr);
-    }
-
-    /**
-     * Attempts to create a JSONObject from a cookie string with
-     * no '=' char.
-     * Expects a JSONException.
-     */
-    @Test
-    public void malFormedNameValueException() {
-        String cookieStr = "thisCookieHasNoEqualsChar";
-        try {
-            Cookie.toJSONObject(cookieStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Expected '=' and instead saw '' at 25 [character 26 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Attempts to create a JSONObject from a cookie string
-     * with embedded ';' char.
-     * Expects a JSONException.
-     */
-    @Test
-    public void booleanAttribute() {
-        String cookieStr = "this=Cookie;myAttribute";
-            JSONObject jo = Cookie.toJSONObject(cookieStr);
-            assertTrue("has key 'name'", jo.has("name"));
-            assertTrue("has key 'value'", jo.has("value"));
-            assertTrue("has key 'myAttribute'", jo.has("myattribute"));
-    }
-
-    /**
-     * Attempts to create a JSONObject from an empty cookie string.

-     * Note: Cookie throws an exception, but CookieList does not.

-     * Expects a JSONException
-     */
-    @Test
-    public void emptyStringCookieException() {
-        String cookieStr = "";
-        try {
-            Cookie.toJSONObject(cookieStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Cookies must have a 'name'",
-                    e.getMessage());
-        }
-    }
-    /**
-     * 
-     * Attempts to create a JSONObject from an cookie string where the name is blank.

-     * Note: Cookie throws an exception, but CookieList does not.

-     * Expects a JSONException
-     */
-    @Test
-    public void emptyNameCookieException() {
-        String cookieStr = " = value ";
-        try {
-            Cookie.toJSONObject(cookieStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Cookies must have a 'name'",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Cookie from a simple name/value pair with no delimiter
-     */
-    @Test
-    public void simpleCookie() {
-        String cookieStr = "SID=31d4d96e407aad42";
-        String expectedCookieStr = "{\"name\":\"SID\",\"value\":\"31d4d96e407aad42\"}";
-        JSONObject jsonObject = Cookie.toJSONObject(cookieStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedCookieStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Store a cookie with all of the supported attributes in a 
-     * JSONObject. The secure attribute, which has no value, is treated
-     * as a boolean.
-     */
-    @Test
-    public void multiPartCookie() {
-        String cookieStr = 
-            "PH=deleted;  "+
-            " expires=Wed, 19-Mar-2014 17:53:53 GMT;"+
-            "path=/;   "+
-            "    domain=.yahoo.com;"+
-            "secure";
-        String expectedCookieStr = 
-            "{"+
-                "\"name\":\"PH\","+
-                "\"value\":\"deleted\","+
-                "\"path\":\"/\","+
-                "\"expires\":\"Wed, 19-Mar-2014 17:53:53 GMT\","+
-                "\"domain\":\".yahoo.com\","+
-                "\"secure\":true"+
-            "}";
-        JSONObject jsonObject = Cookie.toJSONObject(cookieStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedCookieStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Cookie.toString() will emit the non-standard "thiswont=beIncluded"
-     * attribute, and the attribute is still stored in the JSONObject.
-     * This test confirms both behaviors.
-     */
-    @Test
-    public void convertCookieToString() {
-        String cookieStr = 
-            "PH=deleted;  "+
-            " expires=Wed, 19-Mar-2014 17:53:53 GMT;"+
-            "path=/;   "+
-            "    domain=.yahoo.com;"+
-            "thisWont=beIncluded;"+
-            "secure";
-        String expectedCookieStr = 
-            "{\"thiswont\":\"beIncluded\","+
-            "\"path\":\"/\","+
-            "\"expires\":\"Wed, 19-Mar-2014 17:53:53 GMT\","+
-            "\"domain\":\".yahoo.com\","+
-            "\"name\":\"PH\","+
-            "\"secure\":true,"+
-            "\"value\":\"deleted\"}";
-        // Add the nonstandard attribute to the expected cookie string
-        String expectedDirectCompareCookieStr = expectedCookieStr;
-        // convert all strings into JSONObjects
-        JSONObject jsonObject = Cookie.toJSONObject(cookieStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedCookieStr);
-        JSONObject expectedDirectCompareJsonObject = 
-                new JSONObject(expectedDirectCompareCookieStr);
-        // emit the string
-        String cookieToStr = Cookie.toString(jsonObject);
-        // create a final JSONObject from the string
-        JSONObject finalJsonObject = Cookie.toJSONObject(cookieToStr);
-        // JSONObject should contain the nonstandard string
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedDirectCompareJsonObject);
-        // JSONObject -> string -> JSONObject should not contain the nonstandard string
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-
-    /**
-     * A string may be URL-encoded when converting to JSONObject.
-     * If found, '+' is converted to ' ', and %hh hex strings are converted
-     * to their ascii char equivalents. This test confirms the decoding
-     * behavior. 
-     */
-    @Test
-    public void convertEncodedCookieToString() {
-        String cookieStr = 
-            "PH=deleted;  "+
-            " expires=Wed,+19-Mar-2014+17:53:53+GMT;"+
-            "path=/%2Bthis/is%26/a/spec%3Bsegment%3D;   "+
-            "    domain=.yahoo.com;"+
-            "secure";
-        String expectedCookieStr = 
-            "{\"path\":\"/+this/is&/a/spec;segment=\","+
-            "\"expires\":\"Wed, 19-Mar-2014 17:53:53 GMT\","+
-            "\"domain\":\".yahoo.com\","+
-            "\"name\":\"PH\","+
-            "\"secure\":true,"+
-            "\"value\":\"deleted\"}";
-        JSONObject jsonObject = Cookie.toJSONObject(cookieStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedCookieStr);
-        String cookieToStr = Cookie.toString(jsonObject);
-        JSONObject finalJsonObject = Cookie.toJSONObject(cookieToStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-    
-    /**
-     * A public API method performs a URL encoding for selected chars
-     * in a string. Control chars, '+', '%', '=', ';' are all encoded 
-     * as %hh hex strings. The string is also trimmed.
-     * This test confirms that behavior. 
-     */
-    @Test
-    public void escapeString() {
-        String str = "   +%\r\n\t\b%=;;;   ";
-        String expectedStr = "%2b%25%0d%0a%09%08%25%3d%3b%3b%3b";
-        String actualStr = Cookie.escape(str);
-        assertTrue("expect escape() to encode correctly. Actual: " +actualStr+
-                " expected: " +expectedStr, expectedStr.equals(actualStr));
-    }
-
-    /**
-     * A public API method performs URL decoding for strings.
-     * '+' is converted to space and %hh hex strings are converted to
-     * their ascii equivalent values. The string is not trimmed.
-     * This test confirms that behavior. 
-     */
-    @Test
-    public void unescapeString() {
-        String str = " +%2b%25%0d%0a%09%08%25%3d%3b%3b%3b+ ";
-        String expectedStr = "  +%\r\n\t\b%=;;;  ";
-        String actualStr = Cookie.unescape(str);
-        assertTrue("expect unescape() to decode correctly. Actual: " +actualStr+
-                " expected: " +expectedStr, expectedStr.equals(actualStr));
-    }
-}
diff --git a/src/test/java/org/json/junit/EnumTest.java b/src/test/java/org/json/junit/EnumTest.java
deleted file mode 100644
index 1496a63..0000000
--- a/src/test/java/org/json/junit/EnumTest.java
+++ /dev/null
@@ -1,433 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.junit.data.MyEnum;
-import org.json.junit.data.MyEnumClass;
-import org.json.junit.data.MyEnumField;
-import org.junit.Test;
-
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.JsonPath;
-
-/**
- * Enums are not explicitly supported in JSON-Java. But because enums act like
- * classes, all required behavior is already be present in some form. 
- * These tests explore how enum serialization works with JSON-Java.
- */
-public class EnumTest {
-
-    /**
-     * To serialize an enum by its getters, use the JSONObject Object constructor.
-     * The JSONObject ctor handles enum like any other bean. A JSONobject 
-     * is created whose entries are the getter name/value pairs.
-     */
-    @Test
-    public void jsonObjectFromEnum() {
-        // If there are no getters then the object is empty.
-        MyEnum myEnum = MyEnum.VAL2;
-        JSONObject jsonObject = new JSONObject(myEnum);
-        assertTrue("simple enum has no getters", jsonObject.isEmpty());
-
-         // enum with a getters should create a non-empty object 
-        MyEnumField myEnumField = MyEnumField.VAL2;
-        jsonObject = new JSONObject(myEnumField);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonObject.toString());
-        assertTrue("expecting 2 items in top level object", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expecting val 2", "val 2".equals(jsonObject.query("/value")));
-        assertTrue("expecting 2", Integer.valueOf(2).equals(jsonObject.query("/intVal")));
-
-        /**
-         * class which contains enum instances. Each enum should be stored
-         * in its own JSONObject
-         */
-        MyEnumClass myEnumClass = new MyEnumClass();
-        myEnumClass.setMyEnum(MyEnum.VAL1);
-        myEnumClass.setMyEnumField(MyEnumField.VAL3);
-        jsonObject = new JSONObject(myEnumClass);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected 2 myEnumField items", "VAL3".equals((JsonPath.read(doc, "$.myEnumField"))));
-        assertTrue("expected 0 myEnum items", "VAL1".equals((JsonPath.read(doc, "$.myEnum"))));
-
-        assertTrue("expecting MyEnumField.VAL3", MyEnumField.VAL3.equals(jsonObject.query("/myEnumField")));
-        assertTrue("expecting MyEnum.VAL1", MyEnum.VAL1.equals(jsonObject.query("/myEnum")));
-    }
-
-    /**
-     * To serialize an enum by its set of allowed values, use getNames()
-     * and the JSONObject Object with names constructor.
-     */
-    @Test
-    public void jsonObjectFromEnumWithNames() {
-        String [] names;
-        JSONObject jsonObject;
- 
-        MyEnum myEnum = MyEnum.VAL1;
-        names = JSONObject.getNames(myEnum);
-        // The values will be MyEnum fields
-        jsonObject = new JSONObject(myEnum, names);
-
-        // validate JSON object
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected VAL1", MyEnum.VAL1.equals(jsonObject.query("/VAL1")));
-        assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/VAL2")));
-        assertTrue("expected VAL3", MyEnum.VAL3.equals(jsonObject.query("/VAL3")));
-
-        MyEnumField myEnumField = MyEnumField.VAL3;
-        names = JSONObject.getNames(myEnumField);
-        // The values will be MyEnmField fields
-        jsonObject = new JSONObject(myEnumField, names);
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonObject.query("/VAL1")));
-        assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/VAL2")));
-        assertTrue("expected VAL3", MyEnumField.VAL3.equals(jsonObject.query("/VAL3")));
-    }
-    
-    /**
-     * Verify that enums are handled consistently between JSONArray and JSONObject
-     */
-    @Test
-    public void verifyEnumConsistency(){
-        JSONObject jo = new JSONObject();
-        
-        jo.put("value", MyEnumField.VAL2);
-        String expected="{\"value\":\"VAL2\"}";
-        String actual = jo.toString();
-        assertTrue("Expected "+expected+" but actual was "+actual, expected.equals(actual));
-
-        jo.accumulate("value", MyEnumField.VAL1);
-        expected="{\"value\":[\"VAL2\",\"VAL1\"]}";
-        actual = jo.toString();
-        assertTrue("Expected "+expected+" but actual was "+actual, expected.equals(actual));
-
-        jo.remove("value");
-        jo.append("value", MyEnumField.VAL1);
-        expected="{\"value\":[\"VAL1\"]}";
-        actual = jo.toString();
-        assertTrue("Expected "+expected+" but actual was "+actual, expected.equals(actual));
-
-        jo.put("value", EnumSet.of(MyEnumField.VAL2));
-        expected="{\"value\":[\"VAL2\"]}";
-        actual = jo.toString();
-        assertTrue("Expected "+expected+" but actual was "+actual, expected.equals(actual));
-
-        JSONArray ja = new JSONArray();
-        ja.put(MyEnumField.VAL2);
-        jo.put("value", ja);
-        actual = jo.toString();
-        assertTrue("Expected "+expected+" but actual was "+actual, expected.equals(actual));
-
-        jo.put("value", new MyEnumField[]{MyEnumField.VAL2});
-        actual = jo.toString();
-        assertTrue("Expected "+expected+" but actual was "+actual, expected.equals(actual));
-
-    }
-
-    /**
-     * To serialize by assigned value, use the put() methods. The value
-     * will be stored as a enum type. 
-     */
-    @Test
-    public void enumPut() {
-        JSONObject jsonObject = new JSONObject();
-        MyEnum myEnum = MyEnum.VAL2;
-        jsonObject.put("myEnum", myEnum);
-        MyEnumField myEnumField = MyEnumField.VAL1;
-        jsonObject.putOnce("myEnumField", myEnumField);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level objects", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/myEnum")));
-        assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonObject.query("/myEnumField")));
-        
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.put(myEnum);
-        jsonArray.put(1, myEnumField);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 2 top level objects", ((List)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonArray.query("/0")));
-        assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonArray.query("/1")));
-
-        /**
-         * Leaving these tests because they exercise get, opt, and remove
-         */
-        assertTrue("expecting myEnum value", MyEnum.VAL2.equals(jsonArray.get(0)));
-        assertTrue("expecting myEnumField value", MyEnumField.VAL1.equals(jsonArray.opt(1)));
-        assertTrue("expecting myEnumField value", MyEnumField.VAL1.equals(jsonArray.remove(1)));
-    }
-
-    /**
-     * The default action of valueToString() is to call object.toString().
-     * For enums, this means the assigned value will be returned as a string.
-     */
-    @Test
-    public void enumValueToString() {
-        String expectedStr1 = "\"VAL1\"";
-        String expectedStr2 = "\"VAL1\"";
-        MyEnum myEnum = MyEnum.VAL1;
-        MyEnumField myEnumField = MyEnumField.VAL1;
-        MyEnumClass myEnumClass = new MyEnumClass();
-        
-        String str1 = JSONObject.valueToString(myEnum);
-        assertTrue("actual myEnum: "+str1+" expected: "+expectedStr1,
-                str1.equals(expectedStr1));
-        String str2 = JSONObject.valueToString(myEnumField);
-        assertTrue("actual myEnumField: "+str2+" expected: "+expectedStr2,
-                str2.equals(expectedStr2));
-
-        /**
-         * However, an enum within another class will not be rendered
-         * unless that class overrides default toString() 
-         */
-        String expectedStr3 = "\"org.json.junit.data.MyEnumClass@";
-        myEnumClass.setMyEnum(MyEnum.VAL1);
-        myEnumClass.setMyEnumField(MyEnumField.VAL1);
-        String str3 = JSONObject.valueToString(myEnumClass);
-        assertTrue("actual myEnumClass: "+str3+" expected: "+expectedStr3,
-                str3.startsWith(expectedStr3));
-    }
-
-    /**
-     * In whatever form the enum was added to the JSONObject or JSONArray,
-     * json[Object|Array].toString should serialize it in a reasonable way.
-     */
-    @Test
-    public void enumToString() {
-        MyEnum myEnum = MyEnum.VAL2;
-        JSONObject jsonObject = new JSONObject(myEnum);
-        String expectedStr = "{}";
-        assertTrue("myEnum toString() should be empty", expectedStr.equals(jsonObject.toString()));
-
-        MyEnumField myEnumField = MyEnumField.VAL2;
-        jsonObject = new JSONObject(myEnumField);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected val 2", "val 2".equals(jsonObject.query("/value")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/intVal")));
-
-        MyEnumClass myEnumClass = new MyEnumClass();
-        myEnumClass.setMyEnum(MyEnum.VAL1);
-        myEnumClass.setMyEnumField(MyEnumField.VAL3);
-        jsonObject = new JSONObject(myEnumClass);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected VAL3", "VAL3".equals((JsonPath.read(doc, "$.myEnumField"))));
-        assertTrue("expected VAL1", "VAL1".equals((JsonPath.read(doc, "$.myEnum"))));
-
-        String [] names = JSONObject.getNames(myEnum);
-        jsonObject = new JSONObject(myEnum, names);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected VAL1", MyEnum.VAL1.equals(jsonObject.query("/VAL1")));
-        assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/VAL2")));
-        assertTrue("expected VAL3", MyEnum.VAL3.equals(jsonObject.query("/VAL3")));
-        
-        names = JSONObject.getNames(myEnumField);
-        jsonObject = new JSONObject(myEnumField, names);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonObject.query("/VAL1")));
-        assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/VAL2")));
-        assertTrue("expected VAL3", MyEnumField.VAL3.equals(jsonObject.query("/VAL3")));
-
-        expectedStr = "{\"myEnum\":\"VAL2\", \"myEnumField\":\"VAL2\"}";
-        jsonObject = new JSONObject();
-        jsonObject.putOpt("myEnum", myEnum);
-        jsonObject.putOnce("myEnumField", myEnumField);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/myEnum")));
-        assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/myEnumField")));
-
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.put(myEnum);
-        jsonArray.put(1, myEnumField);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 2 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonArray.query("/0")));
-        assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonArray.query("/1")));
-    }
-
-    /**
-     * Wrap should handle enums exactly as a value type like Integer, Boolean, or String.
-     */
-    @Test
-    public void wrap() {
-        assertTrue("simple enum has no getters", JSONObject.wrap(MyEnum.VAL2) instanceof MyEnum);
-
-        MyEnumField myEnumField = MyEnumField.VAL2;
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("enum",myEnumField);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 1 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/enum")));
-
-        MyEnumClass myEnumClass = new MyEnumClass();
-        myEnumClass.setMyEnum(MyEnum.VAL1);
-        myEnumClass.setMyEnumField(MyEnumField.VAL3);
-        jsonObject = (JSONObject)JSONObject.wrap(myEnumClass);
-
-        // validate JSON content
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected VAL3", "VAL3".equals((JsonPath.read(doc, "$.myEnumField"))));
-        assertTrue("expected VAL1", "VAL1".equals((JsonPath.read(doc, "$.myEnum"))));
-
-        assertTrue("expecting MyEnumField.VAL3", MyEnumField.VAL3.equals(jsonObject.query("/myEnumField")));
-        assertTrue("expecting MyEnum.VAL1", MyEnum.VAL1.equals(jsonObject.query("/myEnum")));
-    }
-
-    /**
-     * It was determined that some API methods should be added to 
-     * support enums:

-     * JSONObject.getEnum(class, key)

-     * JSONObject.optEnum(class, key)

-     * JSONObject.optEnum(class, key, default)

-     * JSONArray.getEnum(class, index)

-     * JSONArray.optEnum(class, index)

-     * JSONArray.optEnum(class, index, default)

-     * 

-     * Exercise these enum API methods on JSONObject and JSONArray
-     */
-    @Test
-    public void enumAPI() {
-        MyEnumClass myEnumClass = new MyEnumClass();
-        myEnumClass.setMyEnum(MyEnum.VAL1);
-        MyEnumField myEnumField = MyEnumField.VAL2;
-
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("strKey", "value");
-        jsonObject.put("strKey2", "VAL1");
-        jsonObject.put("enumKey", myEnumField);
-        jsonObject.put("enumClassKey", myEnumClass);
-
-        // get a plain old enum
-        MyEnumField actualEnum = jsonObject.getEnum(MyEnumField.class, "enumKey");
-        assertTrue("get myEnumField", actualEnum == MyEnumField.VAL2);
-
-        // try to get the wrong value
-        try {
-            actualEnum = jsonObject.getEnum(MyEnumField.class, "strKey");
-            assertTrue("should throw an exception for wrong key", false);
-        } catch (Exception ignored) {}
-
-        // get a class that contains an enum
-        MyEnumClass actualEnumClass = (MyEnumClass)jsonObject.get("enumClassKey");
-        assertTrue("get enum", actualEnumClass.getMyEnum() == MyEnum.VAL1);
-
-        // opt a plain old enum
-        actualEnum = jsonObject.optEnum(MyEnumField.class, "enumKey");
-        assertTrue("opt myEnumField", actualEnum == MyEnumField.VAL2);
-
-        // opt the wrong value
-        actualEnum = jsonObject.optEnum(MyEnumField.class, "strKey");
-        assertTrue("opt null", actualEnum == null);
-
-        // opt a class that contains an enum
-        actualEnumClass = (MyEnumClass)jsonObject.opt("enumClassKey");
-        assertTrue("get enum", actualEnumClass.getMyEnum() == MyEnum.VAL1);
-
-        // opt with default a plain old enum
-        actualEnum = jsonObject.optEnum(MyEnumField.class, "enumKey", null);
-        assertTrue("opt myEnumField", actualEnum == MyEnumField.VAL2);
-
-        // opt with default the wrong value
-        actualEnum = jsonObject.optEnum(MyEnumField.class, "strKey", null);
-        assertNull("opt null", actualEnum);
-
-        // opt with default the string value
-        actualEnum = jsonObject.optEnum(MyEnumField.class, "strKey2", null);
-        assertEquals(MyEnumField.VAL1, actualEnum);
-
-        // opt with default an index that does not exist
-        actualEnum = jsonObject.optEnum(MyEnumField.class, "noKey", null);
-        assertNull("opt null", actualEnum);
-        
-        assertNull("Expected Null when the enum class is null",
-                jsonObject.optEnum(null, "enumKey"));
-
-        /**
-         * Exercise the proposed enum API methods on JSONArray
-         */
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.put("value");
-        jsonArray.put(myEnumField);
-        jsonArray.put(myEnumClass);
-
-        // get a plain old enum
-        actualEnum = jsonArray.getEnum(MyEnumField.class, 1);
-        assertTrue("get myEnumField", actualEnum == MyEnumField.VAL2);
-
-        // try to get the wrong value
-        try {
-            actualEnum = jsonArray.getEnum(MyEnumField.class, 0);
-            assertTrue("should throw an exception for wrong index", false);
-        } catch (Exception ignored) {}
-
-        // get a class that contains an enum
-        actualEnumClass = (MyEnumClass)jsonArray.get(2);
-        assertTrue("get enum", actualEnumClass.getMyEnum() == MyEnum.VAL1);
-
-        // opt a plain old enum
-        actualEnum = jsonArray.optEnum(MyEnumField.class, 1);
-        assertTrue("opt myEnumField", actualEnum == MyEnumField.VAL2);
-
-        // opt the wrong value
-        actualEnum = jsonArray.optEnum(MyEnumField.class, 0);
-        assertTrue("opt null", actualEnum == null);
-
-        // opt a class that contains an enum
-        actualEnumClass = (MyEnumClass)jsonArray.opt(2);
-        assertTrue("get enum", actualEnumClass.getMyEnum() == MyEnum.VAL1);
-
-        // opt with default a plain old enum
-        actualEnum = jsonArray.optEnum(MyEnumField.class, 1, null);
-        assertTrue("opt myEnumField", actualEnum == MyEnumField.VAL2);
-
-        // opt with default the wrong value
-        actualEnum = jsonArray.optEnum(MyEnumField.class, 0, null);
-        assertTrue("opt null", actualEnum == null);
-
-        // opt with default an index that does not exist
-        actualEnum = jsonArray.optEnum(MyEnumField.class, 3, null);
-        assertTrue("opt null", actualEnum == null);
-
-    }
-}
diff --git a/src/test/java/org/json/junit/HTTPTest.java b/src/test/java/org/json/junit/HTTPTest.java
deleted file mode 100644
index 703d5ad..0000000
--- a/src/test/java/org/json/junit/HTTPTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import org.json.*;
-import org.junit.Test;
-
-
-/**
- * Unit tests for JSON-Java HTTP.java. See RFC7230.
- */
-public class HTTPTest {
-
-    /**
-     * Attempt to call HTTP.toJSONObject() with a null string
-     * Expects a NUllPointerException.
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullHTTPException() {
-        String httpStr = null;
-        HTTP.toJSONObject(httpStr);
-    }
-
-    /**
-     * Attempt to call HTTP.toJSONObject() with a string containing
-     * an empty object. Expects a JSONException.
-     */
-    @Test
-    public void notEnoughHTTPException() {
-        String httpStr = "{}";
-        JSONObject jsonObject = new JSONObject(httpStr);
-        try {
-            HTTP.toString(jsonObject);
-            assertTrue("Expected to throw exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                    "Not enough material for an HTTP header.".equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Calling HTTP.toJSONObject() with an empty string will result in a 
-     * populated JSONObject with keys but no values for Request-URI, Method,
-     * and HTTP-Version.
-     */
-    @Test
-    public void emptyStringHTTPRequest() {
-        String httpStr = "";
-        String expectedHTTPStr = "{\"Request-URI\":\"\",\"Method\":\"\",\"HTTP-Version\":\"\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Call HTTP.toJSONObject() with a Request-URI, Method,
-     * and HTTP-Version.
-     */
-    @Test
-    public void simpleHTTPRequest() {
-        String httpStr = "GET /hello.txt HTTP/1.1";
-        String expectedHTTPStr = 
-            "{\"Request-URI\":\"/hello.txt\",\"Method\":\"GET\",\"HTTP-Version\":\"HTTP/1.1\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Call HTTP.toJSONObject() with a response string containing a
-     * HTTP-Version, Status-Code, and Reason.
-     */
-    @Test
-    public void simpleHTTPResponse() {
-        String httpStr = "HTTP/1.1 200 OK";
-        String expectedHTTPStr = 
-            "{\"HTTP-Version\":\"HTTP/1.1\",\"Status-Code\":\"200\",\"Reason-Phrase\":\"OK\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Call HTTP.toJSONObject() with a full request string including
-     * request headers. 
-     */
-    @Test
-    public void extendedHTTPRequest() {
-        String httpStr = 
-            "POST /enlighten/calais.asmx HTTP/1.1\n"+
-            "Host: api.opencalais.com\n"+
-            "Content-Type: text/xml; charset=utf-8\n"+
-            "Content-Length: 100\n"+
-            "SOAPAction: \"http://clearforest.com/Enlighten\"";
-        String expectedHTTPStr = 
-            "{"+
-            "\"Request-URI\":\"/enlighten/calais.asmx\","+
-            "\"Host\":\"api.opencalais.com\","+
-            "\"Method\":\"POST\","+
-            "\"HTTP-Version\":\"HTTP/1.1\","+
-            "\"Content-Length\":\"100\","+
-            "\"Content-Type\":\"text/xml; charset=utf-8\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        /**
-         * Not too easy for JSONObject to parse a string with embedded quotes.
-         * For the sake of the test, add it here.
-         */
-        expectedJsonObject.put("SOAPAction","\"http://clearforest.com/Enlighten\"");
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Call HTTP.toJSONObject() with a full response string including
-     * response headers. 
-     */
-    @Test
-    public void extendedHTTPResponse() {
-        String httpStr = 
-            "HTTP/1.1 200 OK\n"+
-            "Content-Type: text/xml; charset=utf-8\n"+
-            "Content-Length: 100\n";
-        String expectedHTTPStr = 
-            "{\"HTTP-Version\":\"HTTP/1.1\","+
-            "\"Status-Code\":\"200\","+
-            "\"Content-Length\":\"100\","+
-            "\"Reason-Phrase\":\"OK\","+
-            "\"Content-Type\":\"text/xml; charset=utf-8\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Call HTTP.toJSONObject() with a full POST request string including
-     * response headers, then convert it back into an HTTP string.
-     */
-    @Test
-    public void convertHTTPRequestToString() {
-        String httpStr = 
-            "POST /enlighten/calais.asmx HTTP/1.1\n"+
-            "Host: api.opencalais.com\n"+
-            "Content-Type: text/xml; charset=utf-8\n"+
-            "Content-Length: 100";
-        String expectedHTTPStr = 
-            "{"+
-            "\"Request-URI\":\"/enlighten/calais.asmx\","+
-            "\"Host\":\"api.opencalais.com\","+
-            "\"Method\":\"POST\","+
-            "\"HTTP-Version\":\"HTTP/1.1\","+
-            "\"Content-Length\":\"100\","+
-            "\"Content-Type\":\"text/xml; charset=utf-8\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        String httpToStr = HTTP.toString(jsonObject);
-        /**
-         * JSONObject objects to crlfs and any trailing chars.
-         * For the sake of the test, simplify the resulting string
-         */
-        httpToStr = httpToStr.replaceAll("("+HTTP.CRLF+HTTP.CRLF+")", "");
-        httpToStr = httpToStr.replaceAll(HTTP.CRLF, "\n");
-        JSONObject finalJsonObject = HTTP.toJSONObject(httpToStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Call HTTP.toJSONObject() with a full response string including
-     * response headers, then convert it back into an HTTP string.
-     */
-    @Test
-    public void convertHTTPResponseToString() {
-        String httpStr = 
-                "HTTP/1.1 200 OK\n"+
-                "Content-Type: text/xml; charset=utf-8\n"+
-                "Content-Length: 100\n";
-            String expectedHTTPStr = 
-                "{\"HTTP-Version\":\"HTTP/1.1\","+
-                "\"Status-Code\":\"200\","+
-                "\"Content-Length\":\"100\","+
-                "\"Reason-Phrase\":\"OK\","+
-                "\"Content-Type\":\"text/xml; charset=utf-8\"}";
-        JSONObject jsonObject = HTTP.toJSONObject(httpStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedHTTPStr);
-        String httpToStr = HTTP.toString(jsonObject);
-        /**
-         * JSONObject objects to crlfs and any trailing chars.
-         * For the sake of the test, simplify the resulting string
-         */
-        httpToStr = httpToStr.replaceAll("("+HTTP.CRLF+HTTP.CRLF+")", "");
-        httpToStr = httpToStr.replaceAll(HTTP.CRLF, "\n");
-        JSONObject finalJsonObject = HTTP.toJSONObject(httpToStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-}
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
deleted file mode 100644
index 4296203..0000000
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ /dev/null
@@ -1,1547 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONParserConfiguration;
-import org.json.JSONPointerException;
-import org.json.JSONString;
-import org.json.JSONTokener;
-import org.json.ParserConfiguration;
-import org.json.junit.data.MyJsonString;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.JsonPath;
-
-
-/**
- * Tests for JSON-Java JSONArray.java
- */
-public class JSONArrayTest {
-    private final String arrayStr = 
-            "["+
-                "true,"+
-                "false,"+
-                "\"true\","+
-                "\"false\","+
-                "\"hello\","+
-                "23.45e-4,"+
-                "\"23.45\","+
-                "42,"+
-                "\"43\","+
-                "["+
-                    "\"world\""+
-                "],"+
-                "{"+
-                    "\"key1\":\"value1\","+
-                    "\"key2\":\"value2\","+
-                    "\"key3\":\"value3\","+
-                    "\"key4\":\"value4\""+
-                "},"+
-                "0,"+
-                "\"-1\""+
-            "]";
-
-    /**
-     * Tests that the similar method is working as expected.
-     */
-    @Test
-    public void verifySimilar() {
-        final String string1 = "HasSameRef";
-        final String string2 = "HasDifferentRef";
-        JSONArray obj1 = new JSONArray()
-                .put("abc")
-                .put(string1)
-                .put(2);
-        
-        JSONArray obj2 = new JSONArray()
-                .put("abc")
-                .put(string1)
-                .put(3);
-
-        JSONArray obj3 = new JSONArray()
-                .put("abc")
-                .put(new String(string1))
-                .put(2);
-
-        JSONArray obj4 = new JSONArray()
-                .put("abc")
-                .put(2.0)
-        		.put(new String(string1));
-
-        JSONArray obj5 = new JSONArray()
-                .put("abc")
-                .put(2.0)
-        		.put(new String(string2));
-        
-        assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
-        assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
-        assertFalse("obj4-obj5 Should eval to false", obj4.similar(obj5));
-    }
-        
-    /**
-     * Attempt to create a JSONArray with a null string.
-     * Expects a NullPointerException.
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullException() {
-        String str = null;
-        assertNull("Should throw an exception", new JSONArray(str));
-    }
-
-    /**
-     * Attempt to create a JSONArray with an empty string.
-     * Expects a JSONException.
-     */
-    @Test
-    public void emptyStr() {
-        String str = "";
-        try {
-            assertNull("Should throw an exception", new JSONArray(str));
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message", 
-                    "A JSONArray text must start with '[' at 0 [character 1 line 1]",
-                    e.getMessage());
-        }
-    }
-    
-    /**
-     * Attempt to create a JSONArray with an unclosed array.
-     * Expects an exception
-     */
-    @Test
-    public void unclosedArray() {
-        try {
-            assertNull("Should throw an exception", new JSONArray("["));
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message", 
-                    "Expected a ',' or ']' at 1 [character 2 line 1]",
-                    e.getMessage());
-        }
-    }
-    
-    /**
-     * Attempt to create a JSONArray with an unclosed array.
-     * Expects an exception
-     */
-    @Test
-    public void unclosedArray2() {
-        try {
-            assertNull("Should throw an exception", new JSONArray("[\"test\""));
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message", 
-                    "Expected a ',' or ']' at 7 [character 8 line 1]",
-                    e.getMessage());
-        }
-    }
-    
-    /**
-     * Attempt to create a JSONArray with an unclosed array.
-     * Expects an exception
-     */
-    @Test
-    public void unclosedArray3() {
-        try {
-            assertNull("Should throw an exception", new JSONArray("[\"test\","));
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message", 
-                    "Expected a ',' or ']' at 8 [character 9 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Attempt to create a JSONArray with a string as object that is
-     * not a JSON array doc.
-     * Expects a JSONException.
-     */
-    @Test
-    public void badObject() {
-        String str = "abc";
-        try {
-            assertNull("Should throw an exception", new JSONArray((Object)str));
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message", 
-                    "JSONArray initial value should be a string or collection or array.".
-                    equals(e.getMessage()));
-        }
-    }
-    
-    /**
-     * Verifies that the constructor has backwards compatibility with RAW types pre-java5.
-     */
-    @Test
-    public void verifyConstructor() {
-        
-        final JSONArray expected = new JSONArray("[10]");
-        
-        @SuppressWarnings("rawtypes")
-        Collection myRawC = Collections.singleton(Integer.valueOf(10));
-        JSONArray jaRaw = new JSONArray(myRawC);
-
-        Collection myCInt = Collections.singleton(Integer.valueOf(10));
-        JSONArray jaInt = new JSONArray(myCInt);
-
-        Collection myCObj = Collections.singleton((Object) Integer
-                .valueOf(10));
-        JSONArray jaObj = new JSONArray(myCObj);
-
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaRaw));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaInt));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaObj));
-        Util.checkJSONArrayMaps(expected);
-        Util.checkJSONArrayMaps(jaObj);
-        Util.checkJSONArrayMaps(jaRaw);
-        Util.checkJSONArrayMaps(jaInt);
-    }
-    
-    @Test
-    public void jsonArrayByListWithNestedNullValue() {
-        List> list = new ArrayList>();
-        Map sub = new HashMap();
-        sub.put("nullKey", null);	
-        list.add(sub);
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(true);
-        JSONArray jsonArray = new JSONArray(list, parserConfiguration);
-        JSONObject subObject = jsonArray.getJSONObject(0);
-        assertTrue(subObject.has("nullKey"));
-        assertEquals(JSONObject.NULL, subObject.get("nullKey"));
-    }
-
-    /**
-     * Tests consecutive calls to putAll with array and collection.
-     */
-    @Test
-    public void verifyPutAll() {
-        final JSONArray jsonArray = new JSONArray();
-
-        // array
-        int[] myInts = { 1, 2, 3, 4, 5 };
-        jsonArray.putAll(myInts);
-
-        assertEquals("int arrays lengths should be equal",
-                     jsonArray.length(),
-                     myInts.length);
-
-        for (int i = 0; i < myInts.length; i++) {
-            assertEquals("int arrays elements should be equal",
-                         myInts[i],
-                         jsonArray.getInt(i));
-        }
-
-        // collection
-        List myList = Arrays.asList("one", "two", "three", "four", "five");
-        jsonArray.putAll(myList);
-
-        int len = myInts.length + myList.size();
-
-        assertEquals("arrays lengths should be equal",
-                     jsonArray.length(),
-                     len);
-
-	// collection as object
-        @SuppressWarnings("RedundantCast")
-        Object myListAsObject = (Object) myList;
-        jsonArray.putAll(myListAsObject);
-	    
-        for (int i = 0; i < myList.size(); i++) {
-            assertEquals("collection elements should be equal",
-                         myList.get(i),
-                         jsonArray.getString(myInts.length + i));
-        }
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Verifies that the put Collection has backwards compatibility with RAW types pre-java5.
-     */
-    @Test
-    public void verifyPutCollection() {
-        
-        final JSONArray expected = new JSONArray("[[10]]");
-
-        @SuppressWarnings("rawtypes")
-        Collection myRawC = Collections.singleton(Integer.valueOf(10));
-        JSONArray jaRaw = new JSONArray();
-        jaRaw.put(myRawC);
-
-        Collection myCObj = Collections.singleton((Object) Integer
-                .valueOf(10));
-        JSONArray jaObj = new JSONArray();
-        jaObj.put(myCObj);
-
-        Collection myCInt = Collections.singleton(Integer.valueOf(10));
-        JSONArray jaInt = new JSONArray();
-        jaInt.put(myCInt);
-
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaRaw));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaObj));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaInt));
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                jaRaw, jaObj, jaInt
-        )));
-    }
-
-    
-    /**
-     * Verifies that the put Map has backwards compatibility with RAW types pre-java5.
-     */
-    @Test
-    public void verifyPutMap() {
-        
-        final JSONArray expected = new JSONArray("[{\"myKey\":10}]");
-
-        @SuppressWarnings("rawtypes")
-        Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
-        JSONArray jaRaw = new JSONArray();
-        jaRaw.put(myRawC);
-
-        Map myCStrObj = Collections.singletonMap("myKey",
-                (Object) Integer.valueOf(10));
-        JSONArray jaStrObj = new JSONArray();
-        jaStrObj.put(myCStrObj);
-
-        Map myCStrInt = Collections.singletonMap("myKey",
-                Integer.valueOf(10));
-        JSONArray jaStrInt = new JSONArray();
-        jaStrInt.put(myCStrInt);
-
-        Map myCObjObj = Collections.singletonMap((Object) "myKey",
-                (Object) Integer.valueOf(10));
-        JSONArray jaObjObj = new JSONArray();
-        jaObjObj.put(myCObjObj);
-
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaRaw));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaStrObj));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaStrInt));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaObjObj));
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                expected, jaRaw, jaStrObj, jaStrInt, jaObjObj
-        )));
-    }
-
-    /**
-     * Create a JSONArray doc with a variety of different elements.
-     * Confirm that the values can be accessed via the get[type]() API methods
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void getArrayValues() {
-        JSONArray jsonArray = new JSONArray(this.arrayStr);
-        // booleans
-        assertTrue("Array true",
-                true == jsonArray.getBoolean(0));
-        assertTrue("Array false",
-                false == jsonArray.getBoolean(1));
-        assertTrue("Array string true",
-                true == jsonArray.getBoolean(2));
-        assertTrue("Array string false",
-                false == jsonArray.getBoolean(3));
-        // strings
-        assertTrue("Array value string",
-                "hello".equals(jsonArray.getString(4)));
-        // doubles
-        assertTrue("Array double",
-                Double.valueOf(23.45e-4).equals(jsonArray.getDouble(5)));
-        assertTrue("Array string double",
-                Double.valueOf(23.45).equals(jsonArray.getDouble(6)));
-        assertTrue("Array double can be float",
-                Float.valueOf(23.45e-4f).equals(jsonArray.getFloat(5)));
-        // ints
-        assertTrue("Array value int",
-                Integer.valueOf(42).equals(jsonArray.getInt(7)));
-        assertTrue("Array value string int",
-                Integer.valueOf(43).equals(jsonArray.getInt(8)));
-        // nested objects
-        JSONArray nestedJsonArray = jsonArray.getJSONArray(9);
-        assertTrue("Array value JSONArray", nestedJsonArray != null);
-        JSONObject nestedJsonObject = jsonArray.getJSONObject(10);
-        assertTrue("Array value JSONObject", nestedJsonObject != null);
-        // longs
-        assertTrue("Array value long",
-                Long.valueOf(0).equals(jsonArray.getLong(11)));
-        assertTrue("Array value string long",
-                Long.valueOf(-1).equals(jsonArray.getLong(12)));
-
-        assertTrue("Array value null", jsonArray.isNull(-1));
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Create a JSONArray doc with a variety of different elements.
-     * Confirm that attempting to get the wrong types via the get[type]()
-     * API methods result in JSONExceptions
-     */
-    @Test
-    public void failedGetArrayValues() {
-        JSONArray jsonArray = new JSONArray(this.arrayStr);
-        try {
-            jsonArray.getBoolean(4);
-            assertTrue("expected getBoolean to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a boolean (class java.lang.String : hello).",e.getMessage());
-        }
-        try {
-            jsonArray.get(-1);
-            assertTrue("expected get to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[-1] not found.",e.getMessage());
-        }
-        try {
-            jsonArray.getDouble(4);
-            assertTrue("expected getDouble to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a double (class java.lang.String : hello).",e.getMessage());
-        }
-        try {
-            jsonArray.getInt(4);
-            assertTrue("expected getInt to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a int (class java.lang.String : hello).",e.getMessage());
-        }
-        try {
-            jsonArray.getJSONArray(4);
-            assertTrue("expected getJSONArray to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a JSONArray (class java.lang.String : hello).",e.getMessage());
-        }
-        try {
-            jsonArray.getJSONObject(4);
-            assertTrue("expected getJSONObject to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a JSONObject (class java.lang.String : hello).",e.getMessage());
-        }
-        try {
-            jsonArray.getLong(4);
-            assertTrue("expected getLong to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a long (class java.lang.String : hello).",e.getMessage());
-        }
-        try {
-            jsonArray.getString(5);
-            assertTrue("expected getString to fail", false);
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message",
-                    "JSONArray[5] is not a String (class java.math.BigDecimal : 0.002345).",e.getMessage());
-        }
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * The JSON parser is permissive of unambiguous unquoted keys and values.
-     * Such JSON text should be allowed, even if it does not strictly conform
-     * to the spec. However, after being parsed, toString() should emit strictly
-     * conforming JSON text.  
-     */
-    @Test
-    public void unquotedText() {
-        String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
-        List expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
-
-        // Test should fail if default strictMode is true, pass if false
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
-        if (jsonParserConfiguration.isStrictMode()) {
-            try {
-                JSONArray jsonArray = new JSONArray(str);
-                assertEquals("Expected to throw exception due to invalid string", true, false);
-            } catch (JSONException e) { }
-        } else {
-            JSONArray jsonArray = new JSONArray(str);
-            assertEquals(expected, jsonArray.toList());
-        }
-    }
-
-    /**
-     * Exercise JSONArray.join() by converting a JSONArray into a 
-     * comma-separated string. Since this is very nearly a JSON document,
-     * array braces are added to the beginning and end prior to validation.
-     */
-    @Test
-    public void join() {
-        JSONArray jsonArray = new JSONArray(this.arrayStr);
-        String joinStr = jsonArray.join(",");
-
-        // validate JSON
-        /**
-         * Don't need to remake the JSONArray to perform the parsing
-         */
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse("["+joinStr+"]");
-        assertTrue("expected 13 items in top level object", ((List)(JsonPath.read(doc, "$"))).size() == 13);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1")));
-        assertTrue("expected \"true\"", "true".equals(jsonArray.query("/2")));
-        assertTrue("expected \"false\"", "false".equals(jsonArray.query("/3")));
-        assertTrue("expected hello", "hello".equals(jsonArray.query("/4")));
-        assertTrue("expected 0.002345", BigDecimal.valueOf(0.002345).equals(jsonArray.query("/5")));
-        assertTrue("expected \"23.45\"", "23.45".equals(jsonArray.query("/6")));
-        assertTrue("expected 42", Integer.valueOf(42).equals(jsonArray.query("/7")));
-        assertTrue("expected \"43\"", "43".equals(jsonArray.query("/8")));
-        assertTrue("expected 1 item in [9]", ((List)(JsonPath.read(doc, "$[9]"))).size() == 1);
-        assertTrue("expected world", "world".equals(jsonArray.query("/9/0")));
-        assertTrue("expected 4 items in [10]", ((Map)(JsonPath.read(doc, "$[10]"))).size() == 4);
-        assertTrue("expected value1", "value1".equals(jsonArray.query("/10/key1")));
-        assertTrue("expected value2", "value2".equals(jsonArray.query("/10/key2")));
-        assertTrue("expected value3", "value3".equals(jsonArray.query("/10/key3")));
-        assertTrue("expected value4", "value4".equals(jsonArray.query("/10/key4")));
-        assertTrue("expected 0", Integer.valueOf(0).equals(jsonArray.query("/11")));
-        assertTrue("expected \"-1\"", "-1".equals(jsonArray.query("/12")));
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Confirm the JSONArray.length() method
-     */
-    @Test 
-    public void length() {
-        assertTrue("expected empty JSONArray length 0",
-                new JSONArray().length() == 0);
-        JSONArray jsonArray = new JSONArray(this.arrayStr);
-        assertTrue("expected JSONArray length 13. instead found "+jsonArray.length(), jsonArray.length() == 13);
-        JSONArray nestedJsonArray = jsonArray.getJSONArray(9);
-        assertTrue("expected JSONArray length 1", nestedJsonArray.length() == 1);
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                jsonArray, nestedJsonArray
-        )));
-    }
-
-    /**
-     * Create a JSONArray doc with a variety of different elements.
-     * Confirm that the values can be accessed via the opt[type](index)
-     * and opt[type](index, default) API methods.
-     */
-    @SuppressWarnings("boxing")
-    @Test 
-    public void opt() {
-        JSONArray jsonArray = new JSONArray(this.arrayStr);
-        assertTrue("Array opt value true",
-                Boolean.TRUE == jsonArray.opt(0));
-        assertTrue("Array opt value out of range",
-                null == jsonArray.opt(-1));
-
-        assertTrue("Array opt value out of range",
-                null == jsonArray.opt(jsonArray.length()));
-
-         assertTrue("Array opt boolean",
-                Boolean.TRUE == jsonArray.optBoolean(0));
-        assertTrue("Array opt boolean default",
-                Boolean.FALSE == jsonArray.optBoolean(-1, Boolean.FALSE));
-        assertTrue("Array opt boolean implicit default",
-                Boolean.FALSE == jsonArray.optBoolean(-1));
-
-         assertTrue("Array opt boolean object",
-                Boolean.TRUE.equals(jsonArray.optBooleanObject(0)));
-        assertTrue("Array opt boolean object default",
-                Boolean.FALSE.equals(jsonArray.optBooleanObject(-1, Boolean.FALSE)));
-        assertTrue("Array opt boolean object implicit default",
-                Boolean.FALSE.equals(jsonArray.optBooleanObject(-1)));
-
-        assertTrue("Array opt double",
-                Double.valueOf(23.45e-4).equals(jsonArray.optDouble(5)));
-        assertTrue("Array opt double default",
-                Double.valueOf(1).equals(jsonArray.optDouble(0, 1)));
-        assertTrue("Array opt double default implicit",
-           Double.valueOf(jsonArray.optDouble(99)).isNaN());
-
-        assertTrue("Array opt double object",
-                Double.valueOf(23.45e-4).equals(jsonArray.optDoubleObject(5)));
-        assertTrue("Array opt double object default",
-                Double.valueOf(1).equals(jsonArray.optDoubleObject(0, 1D)));
-        assertTrue("Array opt double object default implicit",
-                jsonArray.optDoubleObject(99).isNaN());
-
-        assertTrue("Array opt float",
-                Float.valueOf(Double.valueOf(23.45e-4).floatValue()).equals(jsonArray.optFloat(5)));
-        assertTrue("Array opt float default",
-                Float.valueOf(1).equals(jsonArray.optFloat(0, 1)));
-        assertTrue("Array opt float default implicit",
-           Float.valueOf(jsonArray.optFloat(99)).isNaN());
-
-        assertTrue("Array opt float object",
-                Float.valueOf(23.45e-4F).equals(jsonArray.optFloatObject(5)));
-        assertTrue("Array opt float object default",
-                Float.valueOf(1).equals(jsonArray.optFloatObject(0, 1F)));
-        assertTrue("Array opt float object default implicit",
-                jsonArray.optFloatObject(99).isNaN());
-
-        assertTrue("Array opt Number",
-                BigDecimal.valueOf(23.45e-4).equals(jsonArray.optNumber(5)));
-        assertTrue("Array opt Number default",
-                Double.valueOf(1).equals(jsonArray.optNumber(0, 1d)));
-        assertTrue("Array opt Number default implicit",
-           Double.valueOf(jsonArray.optNumber(99,Double.NaN).doubleValue()).isNaN());
-
-        assertTrue("Array opt int",
-                Integer.valueOf(42).equals(jsonArray.optInt(7)));
-        assertTrue("Array opt int default",
-                Integer.valueOf(-1).equals(jsonArray.optInt(0, -1)));
-        assertTrue("Array opt int default implicit",
-                0 == jsonArray.optInt(0));
-
-        assertTrue("Array opt int object",
-                Integer.valueOf(42).equals(jsonArray.optIntegerObject(7)));
-        assertTrue("Array opt int object default",
-                Integer.valueOf(-1).equals(jsonArray.optIntegerObject(0, -1)));
-        assertTrue("Array opt int object default implicit",
-                Integer.valueOf(0).equals(jsonArray.optIntegerObject(0)));
-
-        JSONArray nestedJsonArray = jsonArray.optJSONArray(9);
-        assertTrue("Array opt JSONArray", nestedJsonArray != null);
-        assertTrue("Array opt JSONArray null",
-                null == jsonArray.optJSONArray(99));
-        assertTrue("Array opt JSONArray default",
-                "value".equals(jsonArray.optJSONArray(99, new JSONArray("[\"value\"]")).getString(0)));
-
-        JSONObject nestedJsonObject = jsonArray.optJSONObject(10);
-        assertTrue("Array opt JSONObject", nestedJsonObject != null);
-        assertTrue("Array opt JSONObject null",
-                null == jsonArray.optJSONObject(99));
-        assertTrue("Array opt JSONObject default",
-                "value".equals(jsonArray.optJSONObject(99, new JSONObject("{\"key\":\"value\"}")).getString("key")));
-
-        assertTrue("Array opt long",
-                0 == jsonArray.optLong(11));
-        assertTrue("Array opt long default",
-                -2 == jsonArray.optLong(-1, -2));
-        assertTrue("Array opt long default implicit",
-                0 == jsonArray.optLong(-1));
-
-        assertTrue("Array opt long object",
-                Long.valueOf(0).equals(jsonArray.optLongObject(11)));
-        assertTrue("Array opt long object default",
-                Long.valueOf(-2).equals(jsonArray.optLongObject(-1, -2L)));
-        assertTrue("Array opt long object default implicit",
-                Long.valueOf(0).equals(jsonArray.optLongObject(-1)));
-
-        assertTrue("Array opt string",
-                "hello".equals(jsonArray.optString(4)));
-        assertTrue("Array opt string default implicit",
-                "".equals(jsonArray.optString(-1)));
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                jsonArray, nestedJsonArray
-        )));
-        Util.checkJSONObjectMaps(nestedJsonObject);
-    }
-    
-    /**
-     * Verifies that the opt methods properly convert string values.
-     */
-    @Test
-    public void optStringConversion(){
-        JSONArray ja = new JSONArray("[\"123\",\"true\",\"false\"]");
-        assertTrue("unexpected optBoolean value",ja.optBoolean(1,false)==true);
-        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(true).equals(ja.optBooleanObject(1,false)));
-        assertTrue("unexpected optBoolean value",ja.optBoolean(2,true)==false);
-        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(false).equals(ja.optBooleanObject(2,true)));
-        assertTrue("unexpected optInt value",ja.optInt(0,0)==123);
-        assertTrue("unexpected optIntegerObject value",Integer.valueOf(123).equals(ja.optIntegerObject(0,0)));
-        assertTrue("unexpected optLong value",ja.optLong(0,0)==123);
-        assertTrue("unexpected optLongObject value",Long.valueOf(123).equals(ja.optLongObject(0,0L)));
-        assertTrue("unexpected optDouble value",ja.optDouble(0,0.0)==123.0);
-        assertTrue("unexpected optDoubleObject value",Double.valueOf(123.0).equals(ja.optDoubleObject(0,0.0)));
-        assertTrue("unexpected optBigInteger value",ja.optBigInteger(0,BigInteger.ZERO).compareTo(new BigInteger("123"))==0);
-        assertTrue("unexpected optBigDecimal value",ja.optBigDecimal(0,BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
-        Util.checkJSONArrayMaps(ja);
-    }
-
-    /**
-     * Exercise the JSONArray.put(value) method with various parameters
-     * and confirm the resulting JSONArray.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void put() {
-        JSONArray jsonArray = new JSONArray();
-
-        // index 0
-        jsonArray.put(true);
-        // 1
-        jsonArray.put(false);
-
-        String jsonArrayStr =
-            "["+
-                "\"hello\","+
-                "\"world\""+
-            "]";
-        // 2
-        jsonArray.put(new JSONArray(jsonArrayStr));
-
-        // 3
-        jsonArray.put(2.5);
-        // 4
-        jsonArray.put(1);
-        // 5
-        jsonArray.put(45L);
-
-        // 6
-        jsonArray.put("objectPut");
-
-        String jsonObjectStr = 
-            "{"+
-                "\"key10\":\"val10\","+
-                "\"key20\":\"val20\","+
-                "\"key30\":\"val30\""+
-            "}";
-        JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        // 7
-        jsonArray.put(jsonObject);
-
-        Map map = new HashMap();
-        map.put("k1", "v1");
-        // 8
-        jsonArray.put(map);
-
-        Collection collection = new ArrayList();
-        collection.add(1);
-        collection.add(2);
-        // 9
-        jsonArray.put(collection);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 10 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 10);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1")));
-        assertTrue("expected 2 items in [2]", ((List)(JsonPath.read(doc, "$[2]"))).size() == 2);
-        assertTrue("expected hello", "hello".equals(jsonArray.query("/2/0")));
-        assertTrue("expected world", "world".equals(jsonArray.query("/2/1")));
-        assertTrue("expected 2.5", Double.valueOf(2.5).equals(jsonArray.query("/3")));
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/4")));
-        assertTrue("expected 45", Long.valueOf(45).equals(jsonArray.query("/5")));
-        assertTrue("expected objectPut", "objectPut".equals(jsonArray.query("/6")));
-        assertTrue("expected 3 items in [7]", ((Map)(JsonPath.read(doc, "$[7]"))).size() == 3);
-        assertTrue("expected val10", "val10".equals(jsonArray.query("/7/key10")));
-        assertTrue("expected val20", "val20".equals(jsonArray.query("/7/key20")));
-        assertTrue("expected val30", "val30".equals(jsonArray.query("/7/key30")));
-        assertTrue("expected 1 item in [8]", ((Map)(JsonPath.read(doc, "$[8]"))).size() == 1);
-        assertTrue("expected v1", "v1".equals(jsonArray.query("/8/k1")));
-        assertTrue("expected 2 items in [9]", ((List)(JsonPath.read(doc, "$[9]"))).size() == 2);
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/9/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/9/1")));
-        Util.checkJSONArrayMaps(jsonArray);
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercise the JSONArray.put(index, value) method with various parameters
-     * and confirm the resulting JSONArray.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void putIndex() {
-        JSONArray jsonArray = new JSONArray();
-
-        // 1
-        jsonArray.put(1, false);
-        // index 0
-        jsonArray.put(0, true);
-
-        String jsonArrayStr =
-            "["+
-                "\"hello\","+
-                "\"world\""+
-            "]";
-        // 2
-        jsonArray.put(2, new JSONArray(jsonArrayStr));
-
-        // 5
-        jsonArray.put(5, 45L);
-        // 4
-        jsonArray.put(4, 1);
-        // 3
-        jsonArray.put(3, 2.5);
-
-        // 6
-        jsonArray.put(6, "objectPut");
-
-        // 7 will be null
-
-        String jsonObjectStr = 
-            "{"+
-                "\"key10\":\"val10\","+
-                "\"key20\":\"val20\","+
-                "\"key30\":\"val30\""+
-            "}";
-        JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        jsonArray.put(8, jsonObject);
-        Collection collection = new ArrayList();
-        collection.add(1);
-        collection.add(2);
-        jsonArray.put(9,collection);
-
-        Map map = new HashMap();
-        map.put("k1", "v1");
-        jsonArray.put(10, map);
-        try {
-            jsonArray.put(-1, "abc");
-            assertTrue("put index < 0 should have thrown exception", false);
-        } catch(Exception ignored) {}
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 11 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 11);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1")));
-        assertTrue("expected 2 items in [2]", ((List)(JsonPath.read(doc, "$[2]"))).size() == 2);
-        assertTrue("expected hello", "hello".equals(jsonArray.query("/2/0")));
-        assertTrue("expected world", "world".equals(jsonArray.query("/2/1")));
-        assertTrue("expected 2.5", Double.valueOf(2.5).equals(jsonArray.query("/3")));
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/4")));
-        assertTrue("expected 45", Long.valueOf(45).equals(jsonArray.query("/5")));
-        assertTrue("expected objectPut", "objectPut".equals(jsonArray.query("/6")));
-        assertTrue("expected null", JSONObject.NULL.equals(jsonArray.query("/7")));
-        assertTrue("expected 3 items in [8]", ((Map)(JsonPath.read(doc, "$[8]"))).size() == 3);
-        assertTrue("expected val10", "val10".equals(jsonArray.query("/8/key10")));
-        assertTrue("expected val20", "val20".equals(jsonArray.query("/8/key20")));
-        assertTrue("expected val30", "val30".equals(jsonArray.query("/8/key30")));
-        assertTrue("expected 2 items in [9]", ((List)(JsonPath.read(doc, "$[9]"))).size() == 2);
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/9/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/9/1")));
-        assertTrue("expected 1 item in [10]", ((Map)(JsonPath.read(doc, "$[10]"))).size() == 1);
-        assertTrue("expected v1", "v1".equals(jsonArray.query("/10/k1")));
-        Util.checkJSONObjectMaps(jsonObject);
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Exercise the JSONArray.remove(index) method 
-     * and confirm the resulting JSONArray.
-     */
-    @Test
-    public void remove() {
-        String arrayStr1 = 
-            "["+
-                "1"+
-            "]";
-        JSONArray jsonArray = new JSONArray(arrayStr1);
-        jsonArray.remove(0);
-        assertTrue("array should be empty", null == jsonArray.remove(5));
-        assertTrue("jsonArray should be empty", jsonArray.isEmpty());
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Exercise the JSONArray.similar() method with various parameters
-     * and confirm the results when not similar.
-     */
-    @Test
-    public void notSimilar() {
-        String arrayStr1 = 
-            "["+
-                "1"+
-            "]";
-        JSONArray jsonArray = new JSONArray(arrayStr1);
-        JSONArray otherJsonArray = new JSONArray();
-        assertTrue("arrays lengths differ", !jsonArray.similar(otherJsonArray));
-
-        JSONObject jsonObject = new JSONObject("{\"k1\":\"v1\"}");
-        JSONObject otherJsonObject = new JSONObject();
-        jsonArray = new JSONArray();
-        jsonArray.put(jsonObject);
-        otherJsonArray = new JSONArray();
-        otherJsonArray.put(otherJsonObject);
-        assertTrue("arrays JSONObjects differ", !jsonArray.similar(otherJsonArray));
-
-        JSONArray nestedJsonArray = new JSONArray("[1, 2]");
-        JSONArray otherNestedJsonArray = new JSONArray();
-        jsonArray = new JSONArray();
-        jsonArray.put(nestedJsonArray);
-        otherJsonArray = new JSONArray();
-        otherJsonArray.put(otherNestedJsonArray);
-        assertTrue("arrays nested JSONArrays differ",
-                !jsonArray.similar(otherJsonArray));
-
-        jsonArray = new JSONArray();
-        jsonArray.put("hello");
-        otherJsonArray = new JSONArray();
-        otherJsonArray.put("world");
-        assertTrue("arrays values differ",
-                !jsonArray.similar(otherJsonArray));
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                jsonArray, otherJsonArray
-        )));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject, otherJsonObject
-        )));
-    }
-
-    /**
-     * Exercise JSONArray toString() method with various indent levels.
-     */
-    @Test
-    public void jsonArrayToStringIndent() {
-        String jsonArray0Str =
-                "[" +
-                    "[1,2," +
-                        "{\"key3\":true}" +
-                    "]," +
-                    "{\"key1\":\"val1\",\"key2\":" +
-                        "{\"key2\":\"val2\"}" +
-                    "}," +
-                    "[" +
-                        "[1,2.1]" +
-                    "," +
-                        "[null]" +
-                    "]" +
-                "]";
-
-        String jsonArray1Strs [] = 
-            {
-                "[",
-                " [",
-                "  1,",
-                "  2,",
-                "  {\"key3\": true}",
-                " ],",
-                " {",
-                "  \"key1\": \"val1\",",
-                "  \"key2\": {\"key2\": \"val2\"}",
-                " },",
-                " [",
-                "  [",
-                "   1,",
-                "   2.1",
-                "  ],",
-                "  [null]",
-                " ]",
-                "]"
-            };
-        String jsonArray4Strs [] =
-            {
-                "[",
-                "    [",
-                "        1,",
-                "        2,",
-                "        {\"key3\": true}",
-                "    ],",
-                "    {",
-                "        \"key1\": \"val1\",",
-                "        \"key2\": {\"key2\": \"val2\"}",
-                "    },",
-                "    [",
-                "        [",
-                "            1,",
-                "            2.1",
-                "        ],",
-                "        [null]",
-                "    ]",
-                "]"
-            };
-        JSONArray jsonArray = new JSONArray(jsonArray0Str);
-        String [] actualStrArray = jsonArray.toString().split("\\r?\\n");
-        assertEquals("Expected 1 line", 1, actualStrArray.length);
-        actualStrArray = jsonArray.toString(0).split("\\r?\\n");
-        assertEquals("Expected 1 line", 1, actualStrArray.length);
-
-        actualStrArray = jsonArray.toString(1).split("\\r?\\n");
-        assertEquals("Expected lines", jsonArray1Strs.length, actualStrArray.length);
-        List list = Arrays.asList(actualStrArray);
-        for (String s : jsonArray1Strs) {
-            list.contains(s);
-        }
-        
-        actualStrArray = jsonArray.toString(4).split("\\r?\\n");
-        assertEquals("Expected lines", jsonArray1Strs.length, actualStrArray.length);
-        list = Arrays.asList(actualStrArray);
-        for (String s : jsonArray4Strs) {
-            list.contains(s);
-        }
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Convert an empty JSONArray to JSONObject
-     */
-    @Test
-    public void toJSONObject() {
-        JSONArray names = new JSONArray();
-        JSONArray jsonArray = new JSONArray();
-        assertTrue("toJSONObject should return null",
-                null == jsonArray.toJSONObject(names));
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                names, jsonArray
-        )));
-    }
-
-    /**
-     * Confirm the creation of a JSONArray from an array of ints
-     */
-    @Test
-    public void objectArrayVsIsArray() {
-        int[] myInts = { 1, 2, 3, 4, 5, 6, 7 };
-        Object myObject = myInts;
-        JSONArray jsonArray = new JSONArray(myObject);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 7 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 7);
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/1")));
-        assertTrue("expected 3", Integer.valueOf(3).equals(jsonArray.query("/2")));
-        assertTrue("expected 4", Integer.valueOf(4).equals(jsonArray.query("/3")));
-        assertTrue("expected 5", Integer.valueOf(5).equals(jsonArray.query("/4")));
-        assertTrue("expected 6", Integer.valueOf(6).equals(jsonArray.query("/5")));
-        assertTrue("expected 7", Integer.valueOf(7).equals(jsonArray.query("/6")));
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Exercise the JSONArray iterator.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void iteratorTest() {
-        JSONArray jsonArray = new JSONArray(this.arrayStr);
-        Iterator it = jsonArray.iterator();
-        assertTrue("Array true",
-                Boolean.TRUE.equals(it.next()));
-        assertTrue("Array false",
-                Boolean.FALSE.equals(it.next()));
-        assertTrue("Array string true",
-                "true".equals(it.next()));
-        assertTrue("Array string false",
-                "false".equals(it.next()));
-        assertTrue("Array string",
-                "hello".equals(it.next()));
-
-        assertTrue("Array double [23.45e-4]",
-                new BigDecimal("0.002345").equals(it.next()));
-        assertTrue("Array string double",
-                Double.valueOf(23.45).equals(Double.parseDouble((String)it.next())));
-
-        assertTrue("Array value int",
-                Integer.valueOf(42).equals(it.next()));
-        assertTrue("Array value string int",
-                Integer.valueOf(43).equals(Integer.parseInt((String)it.next())));
-
-        JSONArray nestedJsonArray = (JSONArray)it.next();
-        assertTrue("Array value JSONArray", nestedJsonArray != null);
-
-        JSONObject nestedJsonObject = (JSONObject)it.next();
-        assertTrue("Array value JSONObject", nestedJsonObject != null);
-
-        assertTrue("Array value long",
-                Long.valueOf(0).equals(((Number) it.next()).longValue()));
-        assertTrue("Array value string long",
-                Long.valueOf(-1).equals(Long.parseLong((String) it.next())));
-        assertTrue("should be at end of array", !it.hasNext());
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                jsonArray, nestedJsonArray
-        )));
-        Util.checkJSONObjectMaps(nestedJsonObject);
-    }
-    
-    @Test(expected = JSONPointerException.class)
-    public void queryWithNoResult() {
-        new JSONArray().query("/a/b");
-    }
-    
-    @Test
-    public void optQueryWithNoResult() {
-        assertNull(new JSONArray().optQuery("/a/b"));
-    }
-    
-    @Test(expected = IllegalArgumentException.class)
-    public void optQueryWithSyntaxError() {
-        new JSONArray().optQuery("invalid");
-    }
-
-
-    /**
-     * Exercise the JSONArray write() method
-     */
-    @Test
-    public void write() throws IOException {
-        String str = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":2,\"key3\":3}]";
-        JSONArray jsonArray = new JSONArray(str);
-        String expectedStr = str;
-        StringWriter stringWriter = new StringWriter();
-        try {
-            jsonArray.write(stringWriter);
-            String actualStr = stringWriter.toString();
-            JSONArray finalArray = new JSONArray(actualStr);
-            Util.compareActualVsExpectedJsonArrays(jsonArray, finalArray);
-            assertTrue("write() expected " + expectedStr +
-                    " but found " + actualStr,
-                    actualStr.startsWith("[\"value1\",\"value2\",{")
-                    && actualStr.contains("\"key1\":1")
-                    && actualStr.contains("\"key2\":2")
-                    && actualStr.contains("\"key3\":3")
-                    );
-        } finally {
-            stringWriter.close();
-        }
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Exercise the JSONArray write() method using Appendable.
-     */
-/*
-    @Test
-    public void writeAppendable() {
-        String str = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":2,\"key3\":3}]";
-        JSONArray jsonArray = new JSONArray(str);
-        String expectedStr = str;
-        StringBuilder stringBuilder = new StringBuilder();
-        Appendable appendable = jsonArray.write(stringBuilder);
-        String actualStr = appendable.toString();
-        assertTrue("write() expected " + expectedStr +
-                        " but found " + actualStr,
-                expectedStr.equals(actualStr));
-    }
-*/
-
-    /**
-     * Exercise the JSONArray write(Writer, int, int) method
-     */
-    @Test
-    public void write3Param() throws IOException {
-        String str0 = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":false,\"key3\":3.14}]";
-        JSONArray jsonArray = new JSONArray(str0);
-        String expectedStr = str0;
-        StringWriter stringWriter = new StringWriter();
-        try {
-            String actualStr = jsonArray.write(stringWriter, 0, 0).toString();
-            JSONArray finalArray = new JSONArray(actualStr);
-            Util.compareActualVsExpectedJsonArrays(jsonArray, finalArray);
-            assertTrue("write() expected " + expectedStr +
-                " but found " + actualStr,
-                actualStr.startsWith("[\"value1\",\"value2\",{")
-                && actualStr.contains("\"key1\":1")
-                && actualStr.contains("\"key2\":false")
-                && actualStr.contains("\"key3\":3.14")
-            );
-        } finally {
-            stringWriter.close();
-        }
-        
-        stringWriter = new StringWriter();
-        try {
-            String actualStr = jsonArray.write(stringWriter, 2, 1).toString();
-            JSONArray finalArray = new JSONArray(actualStr);
-            Util.compareActualVsExpectedJsonArrays(jsonArray, finalArray);
-            assertTrue("write() expected " + expectedStr +
-                " but found " + actualStr,
-                actualStr.startsWith("[\n" + 
-                        "   \"value1\",\n" + 
-                        "   \"value2\",\n" + 
-                        "   {")
-                && actualStr.contains("\"key1\": 1")
-                && actualStr.contains("\"key2\": false")
-                && actualStr.contains("\"key3\": 3.14")
-            );
-            Util.checkJSONArrayMaps(finalArray);
-        } finally {
-            stringWriter.close();
-        }
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Exercise the JSONArray write(Appendable, int, int) method
-     */
-/*
-    @Test
-    public void write3ParamAppendable() {
-        String str0 = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":false,\"key3\":3.14}]";
-        String str2 =
-                "[\n" +
-                        "   \"value1\",\n" +
-                        "   \"value2\",\n" +
-                        "   {\n" +
-                        "     \"key1\": 1,\n" +
-                        "     \"key2\": false,\n" +
-                        "     \"key3\": 3.14\n" +
-                        "   }\n" +
-                        " ]";
-        JSONArray jsonArray = new JSONArray(str0);
-        String expectedStr = str0;
-        StringBuilder stringBuilder = new StringBuilder();
-        Appendable appendable = jsonArray.write(stringBuilder, 0, 0);
-        String actualStr = appendable.toString();
-        assertEquals(expectedStr, actualStr);
-
-        expectedStr = str2;
-        stringBuilder = new StringBuilder();
-        appendable = jsonArray.write(stringBuilder, 2, 1);
-        actualStr = appendable.toString();
-        assertEquals(expectedStr, actualStr);
-    }
-*/
-
-    /**
-     * Exercise JSONArray toString() method with various indent levels.
-     */
-    @Test
-    public void toList() {
-        String jsonArrayStr =
-                "[" +
-                    "[1,2," +
-                        "{\"key3\":true}" +
-                    "]," +
-                    "{\"key1\":\"val1\",\"key2\":" +
-                        "{\"key2\":null}," +
-                    "\"key3\":42,\"key4\":[]" +
-                    "}," +
-                    "[" +
-                        "[\"value1\",2.1]" +
-                    "," +
-                        "[null]" +
-                    "]" +
-                "]";
-
-        JSONArray jsonArray = new JSONArray(jsonArrayStr);
-        List list = jsonArray.toList();
-
-        assertTrue("List should not be null", list != null);
-        assertTrue("List should have 3 elements", list.size() == 3);
-
-        List val1List = (List) list.get(0);
-        assertTrue("val1 should not be null", val1List != null);
-        assertTrue("val1 should have 3 elements", val1List.size() == 3);
-
-        assertTrue("val1 value 1 should be 1", val1List.get(0).equals(Integer.valueOf(1)));
-        assertTrue("val1 value 2 should be 2", val1List.get(1).equals(Integer.valueOf(2)));
-
-        Map key1Value3Map = (Map)val1List.get(2);
-        assertTrue("Map should not be null", key1Value3Map != null);
-        assertTrue("Map should have 1 element", key1Value3Map.size() == 1);
-        assertTrue("Map key3 should be true", key1Value3Map.get("key3").equals(Boolean.TRUE));
-
-        Map val2Map = (Map) list.get(1);
-        assertTrue("val2 should not be null", val2Map != null);
-        assertTrue("val2 should have 4 elements", val2Map.size() == 4);
-        assertTrue("val2 map key 1 should be val1", val2Map.get("key1").equals("val1"));
-        assertTrue("val2 map key 3 should be 42", val2Map.get("key3").equals(Integer.valueOf(42)));
-
-        Map val2Key2Map = (Map)val2Map.get("key2");
-        assertTrue("val2 map key 2 should not be null", val2Key2Map != null);
-        assertTrue("val2 map key 2 should have an entry", val2Key2Map.containsKey("key2"));
-        assertTrue("val2 map key 2 value should be null", val2Key2Map.get("key2") == null);
-
-        List val2Key4List = (List)val2Map.get("key4");
-        assertTrue("val2 map key 4 should not be null", val2Key4List != null);
-        assertTrue("val2 map key 4 should be empty", val2Key4List.isEmpty());
-
-        List val3List = (List) list.get(2);
-        assertTrue("val3 should not be null", val3List != null);
-        assertTrue("val3 should have 2 elements", val3List.size() == 2);
-
-        List val3Val1List = (List)val3List.get(0);
-        assertTrue("val3 list val 1 should not be null", val3Val1List != null);
-        assertTrue("val3 list val 1 should have 2 elements", val3Val1List.size() == 2);
-        assertTrue("val3 list val 1 list element 1 should be value1", val3Val1List.get(0).equals("value1"));
-        assertTrue("val3 list val 1 list element 2 should be 2.1", val3Val1List.get(1).equals(new BigDecimal("2.1")));
-
-        List val3Val2List = (List)val3List.get(1);
-        assertTrue("val3 list val 2 should not be null", val3Val2List != null);
-        assertTrue("val3 list val 2 should have 1 element", val3Val2List.size() == 1);
-        assertTrue("val3 list val 2 list element 1 should be null", val3Val2List.get(0) == null);
-
-        // assert that toList() is a deep copy
-        jsonArray.getJSONObject(1).put("key1", "still val1");
-        assertTrue("val2 map key 1 should be val1", val2Map.get("key1").equals("val1"));
-
-        // assert that the new list is mutable
-        assertTrue("Removing an entry should succeed", list.remove(2) != null);
-        assertTrue("List should have 2 elements", list.size() == 2);
-        Util.checkJSONArrayMaps(jsonArray);
-    }
-
-    /**
-     * Create a JSONArray with specified initial capacity.
-     * Expects an exception if the initial capacity is specified as a negative integer 
-     */
-    @Test
-    public void testJSONArrayInt() {
-        assertNotNull(new JSONArray(0));
-        assertNotNull(new JSONArray(5));
-        // Check Size -> Even though the capacity of the JSONArray can be specified using a positive
-        // integer but the length of JSONArray always reflects upon the items added into it.
-        // assertEquals(0l, new JSONArray(10).length());
-        try {
-            assertNotNull("Should throw an exception", new JSONArray(-1));
-        } catch (JSONException e) {
-            assertEquals("Expected an exception message", 
-                    "JSONArray initial capacity cannot be negative.",
-                    e.getMessage());
-        }
-    }
-    
-    /**
-     * Verifies that the object constructor can properly handle any supported collection object.
-     */
-    @Test
-    @SuppressWarnings({ "unchecked", "boxing" })
-    public void testObjectConstructor() {
-        // should copy the array
-        Object o = new Object[] {2, "test2", true};
-        JSONArray a = new JSONArray(o);
-        assertNotNull("Should not error", a);
-        assertEquals("length", 3, a.length());
-        
-        // should NOT copy the collection
-        // this is required for backwards compatibility
-        o = new ArrayList();
-        ((Collection)o).add(1);
-        ((Collection)o).add("test");
-        ((Collection)o).add(false);
-        try {
-            JSONArray a0 = new JSONArray(o);
-            assertNull("Should error", a0);
-        } catch (JSONException ex) {
-        }
-
-        // should NOT copy the JSONArray
-        // this is required for backwards compatibility
-        o = a;
-        try {
-            JSONArray a1 = new JSONArray(o);
-            assertNull("Should error", a1);
-        } catch (JSONException ex) {
-        }
-        Util.checkJSONArrayMaps(a);
-    }
-    
-    /**
-     * Verifies that the JSONArray constructor properly copies the original.
-     */
-    @Test
-    public void testJSONArrayConstructor() {
-        // should copy the array
-        JSONArray a1 = new JSONArray("[2, \"test2\", true]");
-        JSONArray a2 = new JSONArray(a1);
-        assertNotNull("Should not error", a2);
-        assertEquals("length", a1.length(), a2.length());
-        
-        for(int i = 0; i < a1.length(); i++) {
-            assertEquals("index " + i + " are equal", a1.get(i), a2.get(i));
-        }
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                a1, a2
-        )));
-    }
-    
-    /**
-     * Verifies that the object constructor can properly handle any supported collection object.
-     */
-    @Test
-    public void testJSONArrayPutAll() {
-        // should copy the array
-        JSONArray a1 = new JSONArray("[2, \"test2\", true]");
-        JSONArray a2 = new JSONArray();
-        a2.putAll(a1);
-        assertNotNull("Should not error", a2);
-        assertEquals("length", a1.length(), a2.length());
-        
-        for(int i = 0; i < a1.length(); i++) {
-            assertEquals("index " + i + " are equal", a1.get(i), a2.get(i));
-        }
-        Util.checkJSONArraysMaps(new ArrayList(Arrays.asList(
-                a1, a2
-        )));
-    }
-
-    /**
-	 * Tests if calling JSONArray clear() method actually makes the JSONArray empty
-	 */
-	@Test(expected = JSONException.class)
-	public void jsonArrayClearMethodTest() {
-		//Adds random stuff to the JSONArray
-		JSONArray jsonArray = new JSONArray();
-		jsonArray.put(123);
-		jsonArray.put("456");
-		jsonArray.put(new JSONArray());
-		jsonArray.clear(); //Clears the JSONArray
-		assertTrue("expected jsonArray.length() == 0", jsonArray.length() == 0); //Check if its length is 0
-		jsonArray.getInt(0); //Should throws org.json.JSONException: JSONArray[0] not found
-        Util.checkJSONArrayMaps(jsonArray);
-	}
-
-    /**
-    * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
-    */
-    @Ignore("This test relies on system constraints and may not always pass. See: https://github.com/stleary/JSON-java/issues/821")
-    @Test(expected = JSONException.class)
-    public void issue654StackOverflowInputWellFormed() {
-        //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
-        final InputStream resourceAsStream = JSONArrayTest.class.getClassLoader().getResourceAsStream("Issue654WellFormedArray.json");
-        JSONTokener tokener = new JSONTokener(resourceAsStream);
-        JSONArray json_input = new JSONArray(tokener);
-        assertNotNull(json_input);
-        fail("Excepected Exception due to stack overflow.");
-        Util.checkJSONArrayMaps(json_input);
-    }
-
-    @Test
-    public void testIssue682SimilarityOfJSONString() {
-        JSONArray ja1 = new JSONArray()
-                .put(new MyJsonString())
-                .put(2);
-        JSONArray ja2 = new JSONArray()
-                .put(new MyJsonString())
-                .put(2);
-        assertTrue(ja1.similar(ja2));
-
-        JSONArray ja3 = new JSONArray()
-                .put(new JSONString() {
-                    @Override
-                    public String toJSONString() {
-                        return "\"different value\"";
-                    }
-                })
-                .put(2);
-        assertFalse(ja1.similar(ja3));
-    }
-
-    @Test(expected = JSONException.class)
-    public void testRecursiveDepth() {
-      HashMap map = new HashMap<>();
-      map.put("t", map);
-      new JSONArray().put(map);
-    }
-
-    @Test(expected = JSONException.class)
-    public void testRecursiveDepthAtPosition() {
-      HashMap map = new HashMap<>();
-      map.put("t", map);
-      new JSONArray().put(0, map);
-    }
-
-    @Test(expected = JSONException.class)
-    public void testRecursiveDepthArray() {
-      ArrayList array = new ArrayList<>();
-      array.add(array);
-      new JSONArray(array);
-    }
-
-    @Test
-    public void testRecursiveDepthAtPositionDefaultObject() {
-        HashMap map = JSONObjectTest.buildNestedMap(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
-        new JSONArray().put(0, map);
-    }
-
-    @Test
-    public void testRecursiveDepthAtPosition1000Object() {
-        HashMap map = JSONObjectTest.buildNestedMap(1000);
-        new JSONArray().put(0, map, new JSONParserConfiguration().withMaxNestingDepth(1000));
-    }
-
-    @Test(expected = JSONException.class)
-    public void testRecursiveDepthAtPosition1001Object() {
-        HashMap map = JSONObjectTest.buildNestedMap(1001);
-        new JSONArray().put(0, map);
-    }
-
-    @Test(expected = JSONException.class)
-    public void testRecursiveDepthArrayLimitedMaps() {
-        ArrayList array = new ArrayList<>();
-        array.add(array);
-        new JSONArray(array);
-    }
-
-    @Test
-    public void testRecursiveDepthArrayForDefaultLevels() {
-        ArrayList array = buildNestedArray(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
-        new JSONArray(array, new JSONParserConfiguration());
-    }
-
-    @Test
-    public void testRecursiveDepthArrayFor1000Levels() {
-        try {
-            ArrayList array = buildNestedArray(1000);
-            JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
-            new JSONArray(array, parserConfiguration);
-        } catch (StackOverflowError e) {
-            String javaVersion = System.getProperty("java.version");
-            if (javaVersion.startsWith("11.")) {
-                System.out.println(
-                        "testRecursiveDepthArrayFor1000Levels() allowing intermittent stackoverflow, Java Version: "
-                                + javaVersion);
-            } else {
-                String errorStr = "testRecursiveDepthArrayFor1000Levels() unexpected stackoverflow, Java Version: "
-                        + javaVersion;
-                System.out.println(errorStr);
-                throw new RuntimeException(errorStr);
-            }
-        }
-    }
-
-    @Test(expected = JSONException.class)
-    public void testRecursiveDepthArrayFor1001Levels() {
-        ArrayList array = buildNestedArray(1001);
-        new JSONArray(array);
-    }
-
-    @Test
-    public void testStrictModeJSONTokener_expectException(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
-        JSONTokener tokener = new JSONTokener("[\"value\"]invalidCharacters", jsonParserConfiguration);
-
-        assertThrows(JSONException.class, () -> { new JSONArray(tokener); });
-    }
-
-    public static ArrayList buildNestedArray(int maxDepth) {
-        if (maxDepth <= 0) {
-            return new ArrayList<>();
-        }
-        ArrayList nestedArray = new ArrayList<>();
-        nestedArray.add(buildNestedArray(maxDepth - 1));
-        return nestedArray;
-    }
-}
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
deleted file mode 100644
index 5a360dd..0000000
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ /dev/null
@@ -1,989 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import org.json.*;
-import org.junit.Test;
-
-/**
- * Tests for org.json.JSONML.java
- *
- * Certain inputs are expected to result in exceptions. These tests are
- * executed first. JSONML provides an API to:
- *     Convert an XML string into a JSONArray or a JSONObject.
- *     Convert a JSONArray or JSONObject into an XML string.
- * Both fromstring and tostring operations operations should be symmetrical
- * within the limits of JSONML.
- * It should be possible to perform the following operations, which should
- * result in the original string being recovered, within the limits of the
- * underlying classes:
- *  Convert a string -> JSONArray -> string -> JSONObject -> string
- *  Convert a string -> JSONObject -> string -> JSONArray -> string
- *
- */
-public class JSONMLTest {
-
-    /**
-     * Attempts to transform a null XML string to JSON.
-     * Expects a NullPointerException
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullXMLException() {
-        String xmlStr = null;
-        JSONML.toJSONArray(xmlStr);
-    }
-
-    /**
-     * Attempts to transform an empty string to JSON.
-     * Expects a JSONException
-     */
-    @Test
-    public void emptyXMLException() {
-        String xmlStr = "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Bad XML at 0 [character 1 line 1]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Attempts to call JSONML.toString() with a null JSONArray.
-     * Expects a NullPointerException.
-     */
-    @Test(expected=NullPointerException.class)
-    public void nullJSONXMLException() {
-        /**
-         * Tries to convert a null JSONArray to XML.
-         */
-        JSONArray jsonArray= null;
-        JSONML.toString(jsonArray);
-    }
-
-    /**
-     * Attempts to call JSONML.toString() with a null JSONArray.
-     * Expects a JSONException.
-     */
-    @Test
-    public void emptyJSONXMLException() {
-        /**
-         * Tries to convert an empty JSONArray to XML.
-         */
-        JSONArray jsonArray = new JSONArray();
-        try {
-            JSONML.toString(jsonArray);
-            assertTrue("Expecting an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "JSONArray[0] not found.".
-                equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Attempts to transform an non-XML string to JSON.
-     * Expects a JSONException
-     */
-    @Test
-    public void nonXMLException() {
-        /**
-         * Attempts to transform a nonXML string to JSON
-         */
-        String xmlStr = "{ \"this is\": \"not xml\"}";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Bad XML at 23 [character 24 line 1]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Attempts to transform a JSON document with XML content that
-     * does not follow JSONML conventions (element name is not first value
-     * in a nested JSONArray) to a JSONArray then back to string.
-     * Expects a JSONException
-     */
-    @Test
-    public void emptyTagException() {
-        /**
-         * jsonArrayStr is used to build a JSONArray which is then
-         * turned into XML. For this transformation, all arrays represent
-         * elements and the first array entry is the name of the element.
-         * In this case, one of the arrays does not have a name
-         */
-        String jsonArrayStr =
-            "[\"addresses\","+
-                "{\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
-                    "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"},"+
-                // this array has no name
-                "["+
-                    "[\"name\"],"+
-                    "[\"nocontent\"],"+
-                    "\">\""+
-                "]"+
-            "]";
-        JSONArray jsonArray = new JSONArray(jsonArrayStr);
-        try {
-            JSONML.toString(jsonArray);
-            assertTrue("Expecting an exception", false);
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "JSONArray[0] is not a String (class org.json.JSONArray).",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Attempts to transform a JSON document with XML content that
-     * does not follow JSONML conventions (element tag has an embedded space)
-     * to a JSONArray then back to string. Expects a JSONException
-     */
-    @Test
-    public void spaceInTagException() {
-        /**
-         * jsonArrayStr is used to build a JSONArray which is then
-         * turned into XML. For this transformation, all arrays represent
-         * elements and the first array entry is the name of the element.
-         * In this case, one of the element names has an embedded space,
-         * which is not allowed.
-         */
-        String jsonArrayStr =
-            "[\"addresses\","+
-                "{\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
-                    "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"},"+
-                // this array has an invalid name
-                "[\"addr esses\","+
-                    "[\"name\"],"+
-                    "[\"nocontent\"],"+
-                    "\">\""+
-                "]"+
-            "]";
-        JSONArray jsonArray = new JSONArray(jsonArrayStr);
-        try {
-            JSONML.toString(jsonArray);
-            assertTrue("Expecting an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "'addr esses' contains a space character.".
-                equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Attempts to transform a malformed XML document
-     * (element tag has a frontslash) to a JSONArray.\
-     * Expects a JSONException
-     */
-    @Test
-    public void invalidSlashInTagException() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * In this case, the XML is invalid because the 'name' element
-         * contains an invalid frontslash.
-         */
-        String xmlStr =
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       abc street\n"+
-            "    
\n"+
-            "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Misshaped tag at 176 [character 14 line 4]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Malformed XML text (invalid tagname) is transformed into a JSONArray.
-     * Expects a JSONException.
-     */
-    @Test
-    public void invalidBangInTagException() {
-        String xmlStr =
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "    
\n"+
-            "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Misshaped meta tag at 215 [character 12 line 7]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Malformed XML text (invalid tagname, no close bracket) is transformed\
-     * into a JSONArray. Expects a JSONException.
-     */
-    @Test
-    public void invalidBangNoCloseInTagException() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * In this case, the XML is invalid because an element
-         * starts with '!' and has no closing tag
-         */
-        String xmlStr =
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Misshaped meta tag at 214 [character 12 line 7]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Malformed XML text (tagname with no close bracket) is transformed\
-     * into a JSONArray. Expects a JSONException.
-     */
-    @Test
-    public void noCloseStartTagException() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * In this case, the XML is invalid because an element
-         * has no closing '>'.
-         */
-        String xmlStr =
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Misplaced '<' at 194 [character 5 line 6]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Malformed XML text (endtag with no name) is transformed\
-     * into a JSONArray. Expects a JSONException.
-     */
-    @Test
-    public void noCloseEndTagException() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * In this case, the XML is invalid because an element
-         * has no name after the closing tag '\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "   \n"+
-            "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Expected a closing name instead of '>'.".
-                equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Malformed XML text (endtag with no close bracket) is transformed\
-     * into a JSONArray. Expects a JSONException.
-     */
-    @Test
-    public void noCloseEndBraceException() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * In this case, the XML is invalid because an element
-         * has '>' after the closing tag '\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "    ";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Misplaced '<' at 206 [character 1 line 7]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Malformed XML text (incomplete CDATA string) is transformed\
-     * into a JSONArray. Expects a JSONException.
-     */
-    @Test
-    public void invalidCDATABangInTagException() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * In this case, the XML is invalid because an element
-         * does not have a complete CDATA string.
-         */
-        String xmlStr =
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       Joe Tester\n"+
-            "       \n"+
-            "   
\n"+
-            "";
-        try {
-            JSONML.toJSONArray(xmlStr);
-            fail("Expecting an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Expected 'CDATA[' at 204 [character 11 line 5]",
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Convert an XML document into a JSONArray, then use JSONML.toString()
-     * to convert it into a string. This string is then converted back into
-     * a JSONArray. Both JSONArrays are compared against a control to
-     * confirm the contents.
-     */
-    @Test
-    public void toJSONArray() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONArray.
-         * Each element becomes a JSONArray:
-         * 1st entry = elementname
-         * 2nd entry = attributes object (if present)
-         * 3rd entry = content (if present)
-         * 4th entry = child element JSONArrays (if present)
-         * The result is compared against an expected JSONArray.
-         * The transformed JSONArray is then transformed back into a string
-         * which is used to create a final JSONArray, which is also compared
-         * against the expected JSONArray.
-         */
-        String xmlStr =
-            "\n"+
-            "\n"+
-                 "
\n"+
-                     "myName\n"+
-                     ">\n"+
-                 "
\n"+
-            "";
-        String expectedStr =
-            "[\"addresses\","+
-                "{\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
-                    "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"},"+
-                "[\"address\","+
-                    "{\"attr1\":\"attrValue1\",\"attr2\":\"attrValue2\",\"attr3\":\"attrValue3\"},"+
-                    "[\"name\", {\"nameType\":\"mine\"},\"myName\"],"+
-                    "[\"nocontent\"],"+
-                    "\">\""+
-                "]"+
-            "]";
-        JSONArray jsonArray = JSONML.toJSONArray(xmlStr);
-        JSONArray expectedJsonArray = new JSONArray(expectedStr);
-        String xmlToStr = JSONML.toString(jsonArray);
-        JSONArray finalJsonArray = JSONML.toJSONArray(xmlToStr);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-        Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
-    }
-
-    /**
-     * Convert an XML document into a JSONObject. Use JSONML.toString() to
-     * convert it back into a string, and then re-convert it into a JSONObject.
-     * Both JSONObjects are compared against a control JSONObject to confirm
-     * the contents.
-     * 

-     * Next convert the XML document into a JSONArray. Use JSONML.toString() to
-     * convert it back into a string, and then re-convert it into a JSONArray.
-     * Both JSONArrays are compared against a control JSONArray to confirm
-     * the contents.
-     * 

-     * This test gives a comprehensive example of how the JSONML
-     * transformations work.
-     */
-    @Test
-    public void toJSONObjectToJSONArray() {
-        /**
-         * xmlStr contains XML text which is transformed into a JSONObject,
-         * restored to XML, transformed into a JSONArray, and then restored
-         * to XML again. Both JSONObject and JSONArray should contain the same
-         * information and should produce the same XML, allowing for non-ordered
-         * attributes.
-         *
-         * Transformation to JSONObject:
-         *      The elementName is stored as a string where key="tagName"
-         *      Attributes are simply stored as key/value pairs
-         *      If the element has either content or child elements, they are stored
-         *      in a jsonArray with key="childNodes".
-         *
-         * Transformation to JSONArray:
-         *      1st entry = elementname
-         *      2nd entry = attributes object (if present)
-         *      3rd entry = content (if present)
-         *      4th entry = child element JSONArrays (if present)
-         */
-        String xmlStr =
-            "\n"+
-            "\n"+
-                "
\n"+
-                    "Joe Tester\n"+
-                    "\n"+
-                    "\n"+
-                    "true\n"+
-                    "false\n"+
-                    "null\n"+
-                    "42\n"+
-                    "-23\n"+
-                    "-23.45\n"+
-                    "-23x.45\n"+
-                    "\n"+
-                        "1\n"+
-                        "2\n"+
-                        "abc\n"+
-                        "3\n"+
-                        "4.1\n"+
-                        "5.2\n"+
-                    "\n"+
-                "
\n"+
-            "";
-
-        String expectedJSONObjectStr =
-            "{"+
-                "\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
-                "\"childNodes\":["+
-                    "{"+
-                        "\"childNodes\":["+
-                            "{"+
-                                "\"childNodes\":[\"Joe Tester\"],"+
-                                "\"nameType\":\"my name\","+
-                                "\"tagName\":\"name\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[\"Baker street 5\"],"+
-                                "\"tagName\":\"street\""+
-                            "},"+
-                            "{"+
-                                "\"tagName\":\"NothingHere\","+
-                                "\"except\":\"an attribute\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[true],"+
-                                "\"tagName\":\"TrueValue\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[false],"+
-                                "\"tagName\":\"FalseValue\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[null],"+
-                                "\"tagName\":\"NullValue\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[42],"+
-                                "\"tagName\":\"PositiveValue\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[-23],"+
-                                "\"tagName\":\"NegativeValue\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[-23.45],"+
-                                "\"tagName\":\"DoubleValue\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":[\"-23x.45\"],"+
-                                "\"tagName\":\"Nan\""+
-                            "},"+
-                            "{"+
-                                "\"childNodes\":["+
-                                    "{"+
-                                        "\"childNodes\":[1],"+
-                                        "\"tagName\":\"value\""+
-                                    "},"+
-                                    "{"+
-                                        "\"childNodes\":[2],"+
-                                        "\"tagName\":\"value\""+
-                                    "},"+
-                                    "{"+
-                                        "\"childNodes\":["+
-                                            "{"+
-                                                "\"childNodes\":[\"abc\"],"+
-                                                "\"svAttr\":\"svValue\","+
-                                                "\"tagName\":\"subValue\""+
-                                            "}"+
-                                        "],"+
-                                        "\"tagName\":\"value\""+
-                                    "},"+
-                                    "{"+
-                                        "\"childNodes\":[3],"+
-                                        "\"tagName\":\"value\""+
-                                    "},"+
-                                    "{"+
-                                        "\"childNodes\":[4.1],"+
-                                        "\"tagName\":\"value\""+
-                                    "},"+
-                                    "{"+
-                                        "\"childNodes\":[5.2],"+
-                                        "\"tagName\":\"value\""+
-                                    "}"+
-                                "],"+
-                                "\"tagName\":\"ArrayOfNum\""+
-                            "}"+
-                        "],"+
-                        "\"addrType\":\"my address\","+
-                        "\"tagName\":\"address\""+
-                    "}"+
-                "],"+
-                "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\","+
-                "\"tagName\":\"addresses\""+
-            "}";
-
-        String expectedJSONArrayStr =
-            "["+
-                "\"addresses\","+
-                "{"+
-                    "\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
-                    "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\""+
-                "},"+
-                "["+
-                    "\"address\","+
-                    "{"+
-                        "\"addrType\":\"my address\""+
-                    "},"+
-                    "["+
-                        "\"name\","+
-                        "{"+
-                            "\"nameType\":\"my name\""+
-                        "},"+
-                        "\"Joe Tester\""+
-                    "],"+
-                    "[\"street\",\"Baker street 5\"],"+
-                    "["+
-                        "\"NothingHere\","+
-                        "{\"except\":\"an attribute\"}"+
-                    "],"+
-                    "[\"TrueValue\",true],"+
-                    "[\"FalseValue\",false],"+
-                    "[\"NullValue\",null],"+
-                    "[\"PositiveValue\",42],"+
-                    "[\"NegativeValue\",-23],"+
-                    "[\"DoubleValue\",-23.45],"+
-                    "[\"Nan\",\"-23x.45\"],"+
-                    "["+
-                        "\"ArrayOfNum\","+
-                        "[\"value\",1],"+
-                        "[\"value\",2],"+
-                        "[\"value\","+
-                            "["+
-                                "\"subValue\","+
-                                "{\"svAttr\":\"svValue\"},"+
-                                "\"abc\""+
-                            "]"+
-                        "],"+
-                        "[\"value\",3],"+
-                        "[\"value\",4.1],"+
-                        "[\"value\",5.2]"+
-                    "]"+
-                "]"+
-            "]";
-
-        // make a JSONObject and make sure it looks as expected
-        JSONObject jsonObject = JSONML.toJSONObject(xmlStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedJSONObjectStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-
-        // restore the XML, then make another JSONObject and make sure it
-        // looks as expected
-        String jsonObjectXmlToStr = JSONML.toString(jsonObject);
-        JSONObject finalJsonObject = JSONML.toJSONObject(jsonObjectXmlToStr);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject, expectedJsonObject);
-
-        // create a JSON array from the original string and make sure it
-        // looks as expected
-        JSONArray jsonArray = JSONML.toJSONArray(xmlStr);
-        JSONArray expectedJsonArray = new JSONArray(expectedJSONArrayStr);
-        Util.compareActualVsExpectedJsonArrays(jsonArray,expectedJsonArray);
-
-        // restore the XML, then make another JSONArray and make sure it
-        // looks as expected
-        String jsonArrayXmlToStr = JSONML.toString(jsonArray);
-        JSONArray finalJsonArray = JSONML.toJSONArray(jsonArrayXmlToStr);
-        Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
-
-        // lastly, confirm the restored JSONObject XML and JSONArray XML look
-        // reasonably similar
-        JSONObject jsonObjectFromObject = JSONML.toJSONObject(jsonObjectXmlToStr);
-        JSONObject jsonObjectFromArray = JSONML.toJSONObject(jsonArrayXmlToStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObjectFromObject, jsonObjectFromArray);
-    }
-
-    /**
-     * Convert an XML document which contains embedded comments into
-     * a JSONArray. Use JSONML.toString() to turn it into a string, then
-     * reconvert it into a JSONArray. Compare both JSONArrays to a control
-     * JSONArray to confirm the contents.
-     * 

-     * This test shows how XML comments are handled.
-     */
-    @Test
-    public void commentsInXML() {
-
-        String xmlStr =
-            "\n"+
-            "\n"+
-            "\n"+
-                "
\n"+
-                    "\n"+
-                    "Joe Tester\n"+
-                    "\n"+
-                    "Baker street 5\n"+
-                "
\n"+
-            "";
-        String expectedStr =
-            "[\"addresses\","+
-                "[\"address\","+
-                    "[\"name\",\"Joe Tester\"],"+
-                    "[\"street\",\"Baker street 5\"]"+
-                "]"+
-            "]";
-        JSONArray jsonArray = JSONML.toJSONArray(xmlStr);
-        JSONArray expectedJsonArray = new JSONArray(expectedStr);
-        String xmlToStr = JSONML.toString(jsonArray);
-        JSONArray finalJsonArray = JSONML.toJSONArray(xmlToStr);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-        Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
-    }
-
-    /**
-     * JSON string with lost leading zero and converted "True" to true. See test
-     * result in comment below.
-     */
-    @Test
-    public void testToJSONArray_jsonOutput() {
-        final String originalXml = "011000True";
-        final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",1],[\"id\",\"00\"],[\"id\",0],[\"item\",{\"id\":\"01\"}],[\"title\",true]]";
-        final JSONArray actualJsonOutput = JSONML.toJSONArray(originalXml, false);
-        assertEquals(expectedJsonString, actualJsonOutput.toString());
-    }
-
-    /**
-     * JSON string cannot be reverted to original xml when type guessing is used.
-     */
-    @Test
-    public void testToJSONArray_reversibility() {
-        final String originalXml = "011000True";
-        final String revertedXml = JSONML.toString(JSONML.toJSONArray(originalXml, false));
-        assertNotEquals(revertedXml, originalXml);
-    }
-
-    /**
-     * JSON string cannot be reverted to original xml when type guessing is used.
-     * When we force all the values as string, the original text comes back.
-     */
-    @Test
-    public void testToJSONArray_reversibility2() {
-        final String originalXml = "011000True";
-        final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",\"1\"],[\"id\",\"00\"],[\"id\",\"0\"],[\"item\",{\"id\":\"01\"}],[\"title\",\"True\"]]";
-        final JSONArray json = JSONML.toJSONArray(originalXml,true);
-        assertEquals(expectedJsonString, json.toString());
-
-        final String reverseXml = JSONML.toString(json);
-        assertEquals(originalXml, reverseXml);
-    }
-
-    /**
-     * JSON can be reverted to original xml.
-     */
-    @Test
-    public void testToJSONArray_reversibility3() {
-        final String originalXml = "400402";
-        final JSONArray jsonArray = JSONML.toJSONArray(originalXml, false);
-        final String revertedXml = JSONML.toString(jsonArray);
-        assertEquals(revertedXml, originalXml);
-    }
-
-    /**
-     * JSON string cannot be reverted to original xml. See test result in
-     * comment below.
-     */
-    @Test
-    public void testToJSONObject_reversibility() {
-        final String originalXml = "400402";
-        final JSONObject originalObject=JSONML.toJSONObject(originalXml,false);
-        final String originalJson = originalObject.toString();
-        final String xml = JSONML.toString(originalObject);
-        final JSONObject revertedObject = JSONML.toJSONObject(xml, false);
-        final String newJson = revertedObject.toString();
-        assertTrue("JSON Objects are not similar", originalObject.similar(revertedObject));
-        assertTrue("JSON Strings are not similar", new JSONObject(originalJson).similar(new JSONObject(newJson)));
-    }
-
-// these tests do not pass for the following reasons:
-// 1. Our XML parser does not handle generic HTML entities, only valid XML entities. Hence  
-//     or other HTML specific entities would fail on reversability
-// 2. Our JSON implementation for storing the XML attributes uses the standard unordered map.
-//     This means that  can not be reversed reliably.
-//
-//    /**
-//     * Test texts taken from jsonml.org. Currently our implementation FAILS this conversion but shouldn't.
-//     * Technically JsonML should be able to transform any valid xhtml document, but ours only supports
-//     * standard XML entities, not HTML entities.
-//     */
-//    @Test
-//    public void testAttributeConversionReversabilityHTML() {
-//        final String originalXml = "
#5D28D1Example text here
#AF44EF127310656
#AAD034 © 
";
-//        final String expectedJsonString = "[\"table\",{\"class\" : \"MyTable\",\"style\" : \"background-color:yellow\"},[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#550758\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:red\"},\"Example text here\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#993101\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:green\"},\"127624015\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#E33D87\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:blue\"},\"\u00A0\",[\"span\",{ \"style\" : \"background-color:maroon\" },\"\u00A9\"],\"\u00A0\"]]]";
-//        final JSONArray json = JSONML.toJSONArray(originalXml,true);
-//        final String actualJsonString = json.toString();
-//
-//        final String reverseXml = JSONML.toString(json);
-//        assertNotEquals(originalXml, reverseXml);
-//
-//        assertNotEquals(expectedJsonString, actualJsonString);
-//    }
-//
-//    /**
-//     * Test texts taken from jsonml.org but modified to have XML entities only.
-//     */
-//    @Test
-//    public void testAttributeConversionReversabilityXML() {
-//        final String originalXml = "
#5D28D1Example text here
#AF44EF127310656
#AAD034&><
";
-//        final String expectedJsonString = "[\"table\",{\"class\" : \"MyTable\",\"style\" : \"background-color:yellow\"},[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#550758\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:red\"},\"Example text here\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#993101\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:green\"},\"127624015\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#E33D87\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:blue\"},\"&\",[\"span\",{ \"style\" : \"background-color:maroon\" },\">\"],\"<\"]]]";
-//        final JSONArray jsonML = JSONML.toJSONArray(originalXml,true);
-//        final String actualJsonString = jsonML.toString();
-//
-//        final String reverseXml = JSONML.toString(jsonML);
-//        // currently not equal because the hashing of the attribute objects makes the attribute
-//        // order not happen the same way twice
-//        assertEquals(originalXml, reverseXml);
-//
-//        assertEquals(expectedJsonString, actualJsonString);
-//    }
-
-    @Test (timeout = 6000)
-    public void testIssue484InfinteLoop1() {
-        try {
-            JSONML.toJSONObject("??*^M??|?CglR^F??`??>?w??PIlr^E??D^X^]?$?-^R?o??O?*??{OD?^FY??`2a????NM?b^Tq?:O?>S$^K?J?^FB.gUK?m^H??zE??^??!v]?^A???^[^A??^U?c??????h???s???g^Z???`?q^Dbi??:^QZl?)?}1^??k?0??:$V?$?Ovs(}J??^V????2;^QgQ?^_^A?^D?^U?Tg?K?`?h%c?hmGA??w??PIlr??D?$?-?o??O?*??{OD?Y??`2a????NM?bq?:O?>S$?J?B.gUK?m\b??zE???!v]???????c??????h???s???g???`?qbi??:Zl?)?}1^??k?0??:$V?$?Ovs(}J??????2;gQ????Tg?K?`?h%c?hmGA?");
-
-        final int maxNestingDepth = 42;
-
-        try {
-            JSONML.toJSONArray(wayTooLongMalformedXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
-        }
-    }
-
-
-    @Test
-    public void testToJSONArrayMaxNestingDepthIsRespectedWithValidXML() {
-        final String perfectlyFineXML = "\n" +
-            "  \n" +
-            "    sonoo\n" +
-            "    56000\n" +
-            "    true\n" +
-            "  \n" +
-            "\n";
-
-        final int maxNestingDepth = 1;
-
-        try {
-            JSONML.toJSONArray(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
-        }
-    }
-
-    @Test
-    public void testToJSONArrayMaxNestingDepthWithValidFittingXML() {
-        final String perfectlyFineXML = "\n" +
-            "  \n" +
-            "    sonoo\n" +
-            "    56000\n" +
-            "    true\n" +
-            "  \n" +
-            "\n";
-
-        final int maxNestingDepth = 3;
-
-        try {
-            JSONML.toJSONArray(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
-                "parameter of the JSONMLParserConfiguration used");
-        }
-    }
-
-
-    @Test
-    public void testToJSONObjectMaxDefaultNestingDepthIsRespected() {
-        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "");
-
-        try {
-            JSONML.toJSONObject(wayTooLongMalformedXML, JSONMLParserConfiguration.ORIGINAL);
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + JSONMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH));
-        }
-    }
-
-    @Test
-    public void testToJSONObjectUnlimitedNestingDepthIsPossible() {
-        int actualDepth = JSONMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH +10;
-        final String deeperThanDefaultMax = new String(new char[actualDepth]).replace("\0", "") +
-            "value" +
-            new String(new char[actualDepth]).replace("\0", "");
-
-        try {
-            JSONML.toJSONObject(deeperThanDefaultMax, JSONMLParserConfiguration.ORIGINAL
-                .withMaxNestingDepth(JSONMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            fail("XML document should be parsed beyond the default maximum depth if maxNestingDepth " +
-                "parameter is set to -1 in JSONMLParserConfiguration");
-        }
-    }
-
-
-    @Test
-    public void testToJSONObjectMaxNestingDepthOf42IsRespected() {
-        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "");
-
-        final int maxNestingDepth = 42;
-
-        try {
-            JSONML.toJSONObject(wayTooLongMalformedXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
-        }
-    }
-
-    @Test
-    public void testToJSONObjectMaxNestingDepthIsRespectedWithValidXML() {
-        final String perfectlyFineXML = "\n" +
-            "  \n" +
-            "    sonoo\n" +
-            "    56000\n" +
-            "    true\n" +
-            "  \n" +
-            "\n";
-
-        final int maxNestingDepth = 1;
-
-        try {
-            JSONML.toJSONObject(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
-        }
-    }
-
-    @Test
-    public void testToJSONObjectMaxNestingDepthWithValidFittingXML() {
-        final String perfectlyFineXML = "\n" +
-            "  \n" +
-            "    sonoo\n" +
-            "    56000\n" +
-            "    true\n" +
-            "  \n" +
-            "\n";
-
-        final int maxNestingDepth = 3;
-
-        try {
-            JSONML.toJSONObject(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
-                "parameter of the JSONMLParserConfiguration used");
-        }
-    }
-
-}
diff --git a/src/test/java/org/json/junit/JSONObjectLocaleTest.java b/src/test/java/org/json/junit/JSONObjectLocaleTest.java
deleted file mode 100755
index 1cdaf74..0000000
--- a/src/test/java/org/json/junit/JSONObjectLocaleTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.json.*;
-import org.json.junit.data.MyLocaleBean;
-import org.junit.*;
-
-/**
- * Note: This file is saved as UTF-8. Do not save as ASCII or the tests will
- * fail.
- *
- */
-public class JSONObjectLocaleTest {
-    /**
-     * JSONObject built from a bean with locale-specific keys.
-     * In the Turkish alphabet, there are 2 versions of the letter "i".
-     * 'eh' I ı (dotless i)
-     * 'ee' İ i (dotted i)
-     * A problem can occur when parsing the public get methods for a bean.
-     * If the method starts with getI... then the key name will be lowercased
-     * to 'i' in English, and 'ı' in Turkish.
-     * We want the keys to be consistent regardless of locale, so JSON-Java
-     * lowercase operations are made to be locale-neutral by specifying
-     * Locale.ROOT. This causes 'I' to be universally lowercased to 'i'
-     * regardless of the locale currently in effect.
-     */
-    @Test
-    public void jsonObjectByLocaleBean() {
-
-        MyLocaleBean myLocaleBean = new MyLocaleBean();
-
-        /**
-         * This is just the control case which happens when the locale.ROOT
-         * lowercasing behavior is the same as the current locale.
-         */
-        Locale.setDefault(new Locale("en"));
-        JSONObject jsonen = new JSONObject(myLocaleBean);
-        assertEquals("expected size 2, found: " +jsonen.length(), 2, jsonen.length());
-        assertEquals("expected jsonen[i] == beanI", "beanI", jsonen.getString("i"));
-        assertEquals("expected jsonen[id] == beanId", "beanId", jsonen.getString("id"));
-
-        /**
-         * Without the JSON-Java change, these keys would be stored internally as
-         * starting with the letter, 'ı' (dotless i), since the lowercasing of
-         * the getI and getId keys would be specific to the Turkish locale.
-         */
-        Locale.setDefault(new Locale("tr"));
-        JSONObject jsontr = new JSONObject(myLocaleBean);
-        assertEquals("expected size 2, found: " +jsontr.length(), 2, jsontr.length());
-        assertEquals("expected jsontr[i] == beanI", "beanI", jsontr.getString("i"));
-        assertEquals("expected jsontr[id] == beanId", "beanId", jsontr.getString("id"));
-    }
-}
diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java
deleted file mode 100644
index 0f2af29..0000000
--- a/src/test/java/org/json/junit/JSONObjectNumberTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.json.junit;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(value = Parameterized.class)
-public class JSONObjectNumberTest {
-    private final String objectString;
-    private Integer value = 50;
-
-    @Parameters(name = "{index}: {0}")
-    public static Collection data() {
-        return Arrays.asList(new Object[][]{
-            {"{\"value\":50}", 1},
-            {"{\"value\":50.0}", 1},
-            {"{\"value\":5e1}", 1},
-            {"{\"value\":5E1}", 1},
-            {"{\"value\":5e1}", 1},
-            {"{\"value\":\"50\"}", 1},
-            {"{\"value\":-50}", -1},
-            {"{\"value\":-50.0}", -1},
-            {"{\"value\":-5e1}", -1},
-            {"{\"value\":-5E1}", -1},
-            {"{\"value\":-5e1}", -1},
-            {"{\"value\":\"-50\"}", -1}
-            // JSON does not support octal or hex numbers;
-            // see https://stackoverflow.com/a/52671839/6323312
-            // "{value:062}", // octal 50
-            // "{value:0x32}" // hex 50
-        });
-    }
-
-    public JSONObjectNumberTest(String objectString, int resultIsNegative) {
-        this.objectString = objectString;
-        this.value *= resultIsNegative;
-    }
-
-    private JSONObject object;
-
-    @Before
-    public void setJsonObject() {
-        object = new JSONObject(objectString);
-    }
-
-    @Test
-    public void testGetNumber() {
-        assertEquals(value.intValue(), object.getNumber("value").intValue());
-    }
-
-    @Test
-    public void testGetBigDecimal() {
-        assertTrue(BigDecimal.valueOf(value).compareTo(object.getBigDecimal("value")) == 0);
-    }
-
-    @Test
-    public void testGetBigInteger() {
-        assertEquals(BigInteger.valueOf(value), object.getBigInteger("value"));
-    }
-
-    @Test
-    public void testGetFloat() {
-        assertEquals(value.floatValue(), object.getFloat("value"), 0.0f);
-    }
-
-    @Test
-    public void testGetDouble() {
-        assertEquals(value.doubleValue(), object.getDouble("value"), 0.0d);
-    }
-
-    @Test
-    public void testGetInt() {
-        assertEquals(value.intValue(), object.getInt("value"));
-    }
-
-    @Test
-    public void testGetLong() {
-        assertEquals(value.longValue(), object.getLong("value"));
-    }
-
-    @Test
-    public void testOptNumber() {
-        assertEquals(value.intValue(), object.optNumber("value").intValue());
-    }
-
-    @Test
-    public void testOptBigDecimal() {
-        assertTrue(BigDecimal.valueOf(value).compareTo(object.optBigDecimal("value", null)) == 0);
-    }
-
-    @Test
-    public void testOptBigInteger() {
-        assertEquals(BigInteger.valueOf(value), object.optBigInteger("value", null));
-    }
-
-    @Test
-    public void testOptFloat() {
-        assertEquals(value.floatValue(), object.optFloat("value"), 0.0f);
-    }
-
-    @Test
-    public void testOptFloatObject() {
-        assertEquals((Float) value.floatValue(), object.optFloatObject("value"), 0.0f);
-    }
-
-    @Test
-    public void testOptDouble() {
-        assertEquals(value.doubleValue(), object.optDouble("value"), 0.0d);
-    }
-
-    @Test
-    public void testOptDoubleObject() {
-        assertEquals((Double) value.doubleValue(), object.optDoubleObject("value"), 0.0d);
-    }
-
-    @Test
-    public void testOptInt() {
-        assertEquals(value.intValue(), object.optInt("value"));
-    }
-
-    @Test
-    public void testOptIntegerObject() {
-        assertEquals((Integer) value.intValue(), object.optIntegerObject("value"));
-    }
-
-    @Test
-    public void testOptLong() {
-        assertEquals(value.longValue(), object.optLong("value"));
-    }
-
-    @Test
-    public void testOptLongObject() {
-        assertEquals((Long) value.longValue(), object.optLongObject("value"));
-    }
-}
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
deleted file mode 100644
index e7553cd..0000000
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ /dev/null
@@ -1,4015 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Pattern;
-
-import org.json.CDL;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONPointerException;
-import org.json.JSONParserConfiguration;
-import org.json.JSONString;
-import org.json.JSONTokener;
-import org.json.ParserConfiguration;
-import org.json.XML;
-import org.json.junit.data.BrokenToString;
-import org.json.junit.data.ExceptionalBean;
-import org.json.junit.data.Fraction;
-import org.json.junit.data.GenericBean;
-import org.json.junit.data.GenericBeanInt;
-import org.json.junit.data.MyBean;
-import org.json.junit.data.MyBeanCustomName;
-import org.json.junit.data.MyBeanCustomNameSubClass;
-import org.json.junit.data.MyBigNumberBean;
-import org.json.junit.data.MyEnum;
-import org.json.junit.data.MyEnumField;
-import org.json.junit.data.MyJsonString;
-import org.json.junit.data.MyNumber;
-import org.json.junit.data.MyNumberContainer;
-import org.json.junit.data.MyPublicClass;
-import org.json.junit.data.RecursiveBean;
-import org.json.junit.data.RecursiveBeanEquals;
-import org.json.junit.data.Singleton;
-import org.json.junit.data.SingletonEnum;
-import org.json.junit.data.WeirdList;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.JsonPath;
-
-/**
- * JSONObject, along with JSONArray, are the central classes of the reference app.
- * All of the other classes interact with them, and JSON functionality would
- * otherwise be impossible.
- */
-public class JSONObjectTest {
-
-    /**
-     *  Regular Expression Pattern that matches JSON Numbers. This is primarily used for
-     *  output to guarantee that we are always writing valid JSON. 
-     */
-    static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?");
-
-    @After
-    public void tearDown() {
-        SingletonEnum.getInstance().setSomeInt(0);
-        SingletonEnum.getInstance().setSomeString(null);
-        Singleton.getInstance().setSomeInt(0);
-        Singleton.getInstance().setSomeString(null);
-    }
-
-    /**
-     * Tests that the similar method is working as expected.
-     */
-    @Test
-    public void verifySimilar() {
-        final String string1 = "HasSameRef";
-        final String string2 = "HasDifferentRef";
-        JSONObject obj1 = new JSONObject()
-                .put("key1", "abc")
-                .put("key2", 2)
-                .put("key3", string1);
-        
-        JSONObject obj2 = new JSONObject()
-                .put("key1", "abc")
-                .put("key2", 3)
-                .put("key3", string1);
-
-        JSONObject obj3 = new JSONObject()
-                .put("key1", "abc")
-                .put("key2", 2)
-                .put("key3", new String(string1));
-        
-        JSONObject obj4 = new JSONObject()
-                .put("key1", "abc")
-                .put("key2", 2.0)
-                .put("key3", new String(string1));
-
-        JSONObject obj5 = new JSONObject()
-                .put("key1", "abc")
-                .put("key2", 2.0)
-                .put("key3", new String(string2));
-        
-        assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
-        assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
-        assertTrue("obj1-obj4 Should eval to true", obj1.similar(obj4));
-        assertFalse("obj1-obj5 Should eval to false", obj1.similar(obj5));
-        // verify that a double and big decimal are "similar"
-        assertTrue("should eval to true",new JSONObject().put("a",1.1d).similar(new JSONObject("{\"a\":1.1}")));
-        // Confirm #618 is fixed (compare should not exit early if similar numbers are found)
-        // Note that this test may not work if the JSONObject map entry order changes
-        JSONObject first = new JSONObject("{\"a\": 1, \"b\": 2, \"c\": 3}");
-        JSONObject second = new JSONObject("{\"a\": 1, \"b\": 2.0, \"c\": 4}");
-        assertFalse("first-second should eval to false", first.similar(second));
-        List jsonObjects = new ArrayList(
-                Arrays.asList(obj1, obj2, obj3, obj4, obj5)
-        );
-        Util.checkJSONObjectsMaps(jsonObjects);
-    }
-
-    @Test
-    public void timeNumberParsing() {
-        // test data to use
-        final String[] testData = new String[] {
-                null,
-                "",
-                "100",
-                "-100",
-                "abc123",
-                "012345",
-                "100.5e199",
-                "-100.5e199",
-                "DEADBEEF",
-                "0xDEADBEEF",
-                "1234567890.1234567890",
-                "-1234567890.1234567890",
-                "adloghakuidghauiehgauioehgdkjfb nsruoh aeu noerty384 nkljfgh "
-                    + "395h tdfn kdz8yt3 4hkls gn.ey85 4hzfhnz.o8y5a84 onvklt "
-                    + "yh389thub nkz8y49lihv al4itlaithknty8hnbl"
-                // long (in length) number sequences with invalid data at the end of the
-                // string offer very poor performance for the REGEX.
-                ,"123467890123467890123467890123467890123467890123467890123467"
-                    + "8901234678901234678901234678901234678901234678901234678"
-                    + "9012346789012346789012346789012346789012346789012346789"
-                    + "0a"
-        };
-        final int testDataLength = testData.length;
-        /**
-         * Changed to 1000 for faster test runs
-         */
-        // final int iterations = 1000000;
-        final int iterations = 1000;
-
-        // 10 million iterations 1,000,000 * 10 (currently 100,000)
-        long startTime = System.nanoTime();
-        for(int i = 0; i < iterations; i++) {
-            for(int j = 0; j < testDataLength; j++) {
-                try {
-                BigDecimal v1 = new BigDecimal(testData[j]);
-                v1.signum();
-                } catch(Exception ignore) {
-                    //do nothing
-                }
-            }
-        }
-        final long elapsedNano1 = System.nanoTime() - startTime;
-        System.out.println("new BigDecimal(testData[]) : " + elapsedNano1 / 1000000 + " ms");
-
-        startTime = System.nanoTime();
-        for(int i = 0; i < iterations; i++) {
-            for(int j = 0; j < testDataLength; j++) {
-                try {
-                boolean v2 = NUMBER_PATTERN.matcher(testData[j]).matches();
-                assert v2 == !!v2;
-                } catch(Exception ignore) {
-                    //do nothing
-                }
-            }
-        }
-        final long elapsedNano2 = System.nanoTime() - startTime;
-        System.out.println("NUMBER_PATTERN.matcher(testData[]).matches() : " + elapsedNano2 / 1000000 + " ms");
-        // don't assert normally as the testing is machine dependent.
-        // assertTrue("Expected Pattern matching to be faster than BigDecimal constructor",elapsedNano2)(JsonPath.read(doc, "$"))).size() == 4);
-        assertTrue("expected \"falseKey\":false", Boolean.FALSE.equals(jsonObjectByName.query("/falseKey")));
-        assertTrue("expected \"nullKey\":null", JSONObject.NULL.equals(jsonObjectByName.query("/nullKey")));
-        assertTrue("expected \"stringKey\":\"hello world!\"", "hello world!".equals(jsonObjectByName.query("/stringKey")));
-        assertTrue("expected \"doubleKey\":-23.45e67", new BigDecimal("-23.45e67").equals(jsonObjectByName.query("/doubleKey")));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(jsonObject, jsonObjectByName)));
-    }
-
-    /**
-     * JSONObjects can be built from a Map. 
-     * In this test the map is null.
-     * the JSONObject(JsonTokener) ctor is not tested directly since it already
-     * has full coverage from other tests.
-     */
-    @Test
-    public void jsonObjectByNullMap() {
-        Map map = null;
-        JSONObject jsonObject = new JSONObject(map);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * JSONObjects can be built from a Map. 
-     * In this test all of the map entries are valid JSON types.
-     */
-    @Test
-    public void jsonObjectByMap() {
-        Map map = new HashMap();
-        map.put("trueKey", Boolean.valueOf(true));
-        map.put("falseKey", Boolean.valueOf(false));
-        map.put("stringKey", "hello world!");
-        map.put("escapeStringKey", "h\be\tllo w\u1234orld!");
-        map.put("intKey", Long.valueOf(42));
-        map.put("doubleKey", Double.valueOf(-23.45e67));
-        JSONObject jsonObject = new JSONObject(map);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected \"trueKey\":true", Boolean.TRUE.equals(jsonObject.query("/trueKey")));
-        assertTrue("expected \"falseKey\":false", Boolean.FALSE.equals(jsonObject.query("/falseKey")));
-        assertTrue("expected \"stringKey\":\"hello world!\"", "hello world!".equals(jsonObject.query("/stringKey")));
-        assertTrue("expected \"escapeStringKey\":\"h\be\tllo w\u1234orld!\"", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
-        assertTrue("expected \"doubleKey\":-23.45e67", Double.valueOf("-23.45e67").equals(jsonObject.query("/doubleKey")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Verifies that the constructor has backwards compatability with RAW types pre-java5.
-     */
-    @Test
-    public void verifyConstructor() {
-        
-        final JSONObject expected = new JSONObject("{\"myKey\":10}");
-        
-        @SuppressWarnings("rawtypes")
-        Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
-        JSONObject jaRaw = new JSONObject(myRawC);
-
-        Map myCStrObj = Collections.singletonMap("myKey",
-                (Object) Integer.valueOf(10));
-        JSONObject jaStrObj = new JSONObject(myCStrObj);
-
-        Map myCStrInt = Collections.singletonMap("myKey",
-                Integer.valueOf(10));
-        JSONObject jaStrInt = new JSONObject(myCStrInt);
-
-        Map myCObjObj = Collections.singletonMap((Object) "myKey",
-                (Object) Integer.valueOf(10));
-        JSONObject jaObjObj = new JSONObject(myCObjObj);
-
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaRaw));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaStrObj));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaStrInt));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaObjObj));
-        Util.checkJSONObjectsMaps(new ArrayList(
-                Arrays.asList(jaRaw, jaStrObj, jaStrInt, jaObjObj))
-        );
-    }
-    
-    /**
-     * Tests Number serialization.
-     */
-    @Test
-    public void verifyNumberOutput(){
-        /**
-         * MyNumberContainer is a POJO, so call JSONObject(bean), 
-         * which builds a map of getter names/values
-         * The only getter is getMyNumber (key=myNumber), 
-         * whose return value is MyNumber. MyNumber extends Number, 
-         * but is not recognized as such by wrap() per current
-         * implementation, so wrap() returns the default new JSONObject(bean).
-         * The only getter is getNumber (key=number), whose return value is
-         * BigDecimal(42). 
-         */
-        JSONObject jsonObject0 = new JSONObject(new MyNumberContainer());
-        String actual = jsonObject0.toString();
-        String expected = "{\"myNumber\":{\"number\":42}}";
-        assertEquals("Equal", expected , actual);
-        
-        /**
-         * JSONObject.put() handles objects differently than the 
-         * bean constructor. Where the bean ctor wraps objects before 
-         * placing them in the map, put() inserts the object without wrapping.
-         * In this case, a MyNumber instance is the value.
-         * The MyNumber.toString() method is responsible for
-         * returning a reasonable value: the string '42'.
-         */
-        JSONObject jsonObject1 = new JSONObject();
-        jsonObject1.put("myNumber", new MyNumber());
-        actual = jsonObject1.toString();
-        expected = "{\"myNumber\":42}";
-        assertEquals("Equal", expected , actual);
-
-        /**
-         * Calls the JSONObject(Map) ctor, which calls wrap() for values.
-         * AtomicInteger is a Number, but is not recognized by wrap(), per
-         * current implementation. However, the type is
-         * 'java.util.concurrent.atomic', so due to the 'java' prefix,
-         * wrap() inserts the value as a string. That is why 42 comes back
-         * wrapped in quotes.
-         */
-        JSONObject jsonObject2 = new JSONObject(Collections.singletonMap("myNumber", new AtomicInteger(42)));
-        actual = jsonObject2.toString();
-        expected = "{\"myNumber\":\"42\"}";
-        assertEquals("Equal", expected , actual);
-
-        /**
-         * JSONObject.put() inserts the AtomicInteger directly into the
-         * map not calling wrap(). In toString()->write()->writeValue(), 
-         * AtomicInteger is recognized as a Number, and converted via
-         * numberToString() into the unquoted string '42'.
-         */
-        JSONObject jsonObject3 = new JSONObject();
-        jsonObject3.put("myNumber", new AtomicInteger(42));
-        actual = jsonObject3.toString();
-        expected = "{\"myNumber\":42}";
-        assertEquals("Equal", expected , actual);
-
-        /**
-         * Calls the JSONObject(Map) ctor, which calls wrap() for values.
-         * Fraction is a Number, but is not recognized by wrap(), per
-         * current implementation. As a POJO, Fraction is handled as a
-         * bean and inserted into a contained JSONObject. It has 2 getters,
-         * for numerator and denominator. 
-         */
-        JSONObject jsonObject4 = new JSONObject(Collections.singletonMap("myNumber", new Fraction(4,2)));
-        assertEquals(1, jsonObject4.length());
-        assertEquals(2, ((JSONObject)(jsonObject4.get("myNumber"))).length());
-        assertEquals("Numerator", BigInteger.valueOf(4) , jsonObject4.query("/myNumber/numerator"));
-        assertEquals("Denominator", BigInteger.valueOf(2) , jsonObject4.query("/myNumber/denominator"));
-
-        /**
-         * JSONObject.put() inserts the Fraction directly into the
-         * map not calling wrap(). In toString()->write()->writeValue(), 
-         * Fraction is recognized as a Number, and converted via
-         * numberToString() into the unquoted string '4/2'. But the 
-         * BigDecimal sanity check fails, so writeValue() defaults
-         * to returning a safe JSON quoted string. Pretty slick!
-         */
-        JSONObject jsonObject5 = new JSONObject();
-        jsonObject5.put("myNumber", new Fraction(4,2));
-        actual = jsonObject5.toString();
-        expected = "{\"myNumber\":\"4/2\"}"; // valid JSON, bug fixed
-        assertEquals("Equal", expected , actual);
-
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject0, jsonObject1, jsonObject2, jsonObject3, jsonObject4, jsonObject5
-        )));
-    }
-
-    /**
-     * Verifies that the put Collection has backwards compatibility with RAW types pre-java5.
-     */
-    @Test
-    public void verifyPutCollection() {
-        
-        final JSONObject expected = new JSONObject("{\"myCollection\":[10]}");
-
-        @SuppressWarnings("rawtypes")
-        Collection myRawC = Collections.singleton(Integer.valueOf(10));
-        JSONObject jaRaw = new JSONObject();
-        jaRaw.put("myCollection", myRawC);
-
-        Collection myCObj = Collections.singleton((Object) Integer
-                .valueOf(10));
-        JSONObject jaObj = new JSONObject();
-        jaObj.put("myCollection", myCObj);
-
-        Collection myCInt = Collections.singleton(Integer
-                .valueOf(10));
-        JSONObject jaInt = new JSONObject();
-        jaInt.put("myCollection", myCInt);
-
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaRaw));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaObj));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaInt));
-
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jaRaw, jaObj, jaInt
-        )));
-    }
-
-    
-    /**
-     * Verifies that the put Map has backwards compatibility with RAW types pre-java5.
-     */
-    @Test
-    public void verifyPutMap() {
-        
-        final JSONObject expected = new JSONObject("{\"myMap\":{\"myKey\":10}}");
-
-        @SuppressWarnings("rawtypes")
-        Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
-        JSONObject jaRaw = new JSONObject();
-        jaRaw.put("myMap", myRawC);
-
-        Map myCStrObj = Collections.singletonMap("myKey",
-                (Object) Integer.valueOf(10));
-        JSONObject jaStrObj = new JSONObject();
-        jaStrObj.put("myMap", myCStrObj);
-
-        Map myCStrInt = Collections.singletonMap("myKey",
-                Integer.valueOf(10));
-        JSONObject jaStrInt = new JSONObject();
-        jaStrInt.put("myMap", myCStrInt);
-
-        Map myCObjObj = Collections.singletonMap((Object) "myKey",
-                (Object) Integer.valueOf(10));
-        JSONObject jaObjObj = new JSONObject();
-        jaObjObj.put("myMap", myCObjObj);
-
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaRaw));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaStrObj));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaStrInt));
-        assertTrue(
-                "The RAW Collection should give me the same as the Typed Collection",
-                expected.similar(jaObjObj));
-
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jaRaw, jaStrObj, jaStrInt, jaStrObj
-        )));
-    }
-
-
-    /**
-     * JSONObjects can be built from a Map. 
-     * In this test the map entries are not valid JSON types.
-     * The actual conversion is kind of interesting.
-     */
-    @Test
-    public void jsonObjectByMapWithUnsupportedValues() {
-        Map jsonMap = new HashMap();
-        // Just insert some random objects
-        jsonMap.put("key1", new CDL());
-        jsonMap.put("key2", new Exception());
-
-        JSONObject jsonObject = new JSONObject(jsonMap);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected 0 key1 items", ((Map)(JsonPath.read(doc, "$.key1"))).size() == 0);
-        assertTrue("expected \"key2\":java.lang.Exception","java.lang.Exception".equals(jsonObject.query("/key2")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * JSONObjects can be built from a Map. 
-     * In this test one of the map values is null 
-     */
-    @Test
-    public void jsonObjectByMapWithNullValue() {
-        Map map = new HashMap();
-        map.put("trueKey", Boolean.valueOf(true));
-        map.put("falseKey", Boolean.valueOf(false));
-        map.put("stringKey", "hello world!");
-        map.put("nullKey", null);
-        map.put("escapeStringKey", "h\be\tllo w\u1234orld!");
-        map.put("intKey", Long.valueOf(42));
-        map.put("doubleKey", Double.valueOf(-23.45e67));
-        JSONObject jsonObject = new JSONObject(map);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected \"trueKey\":true", Boolean.TRUE.equals(jsonObject.query("/trueKey")));
-        assertTrue("expected \"falseKey\":false", Boolean.FALSE.equals(jsonObject.query("/falseKey")));
-        assertTrue("expected \"stringKey\":\"hello world!\"", "hello world!".equals(jsonObject.query("/stringKey")));
-        assertTrue("expected \"escapeStringKey\":\"h\be\tllo w\u1234orld!\"", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
-        assertTrue("expected \"intKey\":42", Long.valueOf("42").equals(jsonObject.query("/intKey")));
-        assertTrue("expected \"doubleKey\":-23.45e67", Double.valueOf("-23.45e67").equals(jsonObject.query("/doubleKey")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-    
-    @Test
-    public void jsonObjectByMapWithNullValueAndParserConfiguration() {
-        Map map = new HashMap();
-        map.put("nullKey", null);
-        
-        // by default, null values are ignored
-        JSONObject obj1 = new JSONObject(map);
-        assertTrue("expected null value to be ignored by default", obj1.isEmpty());
-
-        // if configured, null values are written as such into the JSONObject.
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(true);
-        JSONObject obj2 = new JSONObject(map, parserConfiguration);
-        assertFalse("expected null value to accepted when configured", obj2.isEmpty());
-        assertTrue(obj2.has("nullKey"));
-        assertEquals(JSONObject.NULL, obj2.get("nullKey"));
-    }
-    
-    @Test
-    public void jsonObjectByMapWithNestedNullValueAndParserConfiguration() {
-        Map map = new HashMap();
-        Map nestedMap = new HashMap();
-        nestedMap.put("nullKey", null);
-        map.put("nestedMap", nestedMap);
-        List> nestedList = new ArrayList>();
-        nestedList.add(nestedMap);        
-        map.put("nestedList", nestedList);
-        
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(true);
-        JSONObject jsonObject = new JSONObject(map, parserConfiguration);
-
-        JSONObject nestedObject = jsonObject.getJSONObject("nestedMap");
-        assertTrue(nestedObject.has("nullKey"));
-        assertEquals(JSONObject.NULL, nestedObject.get("nullKey"));
-        
-        JSONArray nestedArray = jsonObject.getJSONArray("nestedList");
-        assertEquals(1, nestedArray.length());
-        assertTrue(nestedArray.getJSONObject(0).has("nullKey"));
-        assertEquals(JSONObject.NULL, nestedArray.getJSONObject(0).get("nullKey"));
-    }
-
-    /**
-     * JSONObject built from a bean. In this case all but one of the 
-     * bean getters return valid JSON types
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void jsonObjectByBean1() {
-        /**
-         * Default access classes have to be mocked since JSONObject, which is
-         * not in the same package, cannot call MyBean methods by reflection.
-         */
-        MyBean myBean = mock(MyBean.class);
-        when(myBean.getDoubleKey()).thenReturn(-23.45e7);
-        when(myBean.getIntKey()).thenReturn(42);
-        when(myBean.getStringKey()).thenReturn("hello world!");
-        when(myBean.getEscapeStringKey()).thenReturn("h\be\tllo w\u1234orld!");
-        when(myBean.isTrueKey()).thenReturn(true);
-        when(myBean.isFalseKey()).thenReturn(false);
-        when(myBean.getStringReaderKey()).thenReturn(
-            new StringReader("") {
-            });
-
-        JSONObject jsonObject = new JSONObject(myBean);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 8 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 8);
-        assertTrue("expected 0 items in stringReaderKey", ((Map) (JsonPath.read(doc, "$.stringReaderKey"))).size() == 0);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueKey")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseKey")));
-        assertTrue("expected hello world!","hello world!".equals(jsonObject.query("/stringKey")));
-        assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
-        assertTrue("expected 42", Integer.valueOf("42").equals(jsonObject.query("/intKey")));
-        assertTrue("expected -23.45e7", Double.valueOf("-23.45e7").equals(jsonObject.query("/doubleKey")));
-        // sorry, mockito artifact
-        assertTrue("expected 2 mockitoInterceptor items", ((Map)(JsonPath.read(doc, "$.mockitoInterceptor"))).size() == 2);
-        assertTrue("expected 0 mockitoInterceptor.serializationSupport items",
-                ((Map)(JsonPath.read(doc, "$.mockitoInterceptor.serializationSupport"))).size() == 0);
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * JSONObject built from a bean that has custom field names.
-     */
-    @Test
-    public void jsonObjectByBean2() {
-        JSONObject jsonObject = new JSONObject(new MyBeanCustomName());
-        assertNotNull(jsonObject);
-        assertEquals("Wrong number of keys found:",
-                5,
-                jsonObject.keySet().size());
-        assertFalse("Normal field name (someString) processing did not work",
-                jsonObject.has("someString"));
-        assertFalse("Normal field name (myDouble) processing did not work",
-                jsonObject.has("myDouble"));
-        assertFalse("Normal field name (someFloat) processing did not work",
-                jsonObject.has("someFloat"));
-        assertFalse("Ignored field not found!",
-                jsonObject.has("ignoredInt"));
-        // getSomeInt() has no user-defined annotation
-        assertTrue("Normal field name (someInt) should have been found",
-                jsonObject.has("someInt"));
-        // the user-defined annotation does not replace any value, so someLong should be found
-        assertTrue("Normal field name (someLong) should have been found",
-                jsonObject.has("someLong"));
-        // myStringField replaces someString property name via user-defined annotation
-        assertTrue("Overridden String field name (myStringField) should have been found",
-                jsonObject.has("myStringField"));
-        // weird name replaces myDouble property name via user-defined annotation
-        assertTrue("Overridden String field name (Some Weird NAme that Normally Wouldn't be possible!) should have been found",
-                jsonObject.has("Some Weird NAme that Normally Wouldn't be possible!"));
-        // InterfaceField replaces someFloat property name via user-defined annotation
-        assertTrue("Overridden String field name (InterfaceField) should have been found",
-                jsonObject.has("InterfaceField"));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-    
-    /**
-     * JSONObject built from a bean that has custom field names inherited from a parent class.
-     */
-    @Test
-    public void jsonObjectByBean3() {
-        JSONObject jsonObject = new JSONObject(new MyBeanCustomNameSubClass());
-        assertNotNull(jsonObject);
-        assertEquals("Wrong number of keys found:",
-                7,
-                jsonObject.keySet().size());
-        assertFalse("Normal int field name (someInt) found, but was overridden",
-                jsonObject.has("someInt"));
-        assertFalse("Normal field name (myDouble) processing did not work",
-                jsonObject.has("myDouble"));
-        // myDouble was replaced by weird name, and then replaced again by AMoreNormalName via user-defined annotation
-        assertFalse("Overridden String field name (Some Weird NAme that Normally Wouldn't be possible!) should not be FOUND!",
-                jsonObject.has("Some Weird NAme that Normally Wouldn't be possible!"));
-        assertFalse("Normal field name (someFloat) found, but was overridden",
-                jsonObject.has("someFloat"));
-        assertFalse("Ignored field found! but was overridden",
-                jsonObject.has("ignoredInt"));
-        // shouldNotBeJSON property name was first ignored, then replaced by ShouldBeIgnored via user-defined annotations
-        assertFalse("Ignored field at the same level as forced name should not have been found",
-                jsonObject.has("ShouldBeIgnored"));
-        // able property name was replaced by Getable via user-defined annotation
-        assertFalse("Normally ignored field (able) with explicit property name should not have been found",
-                jsonObject.has("able"));
-        // property name someInt was replaced by newIntFieldName via user-defined annotation
-        assertTrue("Overridden int field name (newIntFieldName) should have been found",
-                jsonObject.has("newIntFieldName"));
-        // property name someLong was not replaced via user-defined annotation
-        assertTrue("Normal field name (someLong) should have been found",
-                jsonObject.has("someLong"));
-        // property name someString was replaced by myStringField via user-defined annotation
-        assertTrue("Overridden String field name (myStringField) should have been found",
-                jsonObject.has("myStringField"));
-        // property name myDouble was replaced by a weird name, followed by AMoreNormalName via user-defined annotations
-        assertTrue("Overridden double field name (AMoreNormalName) should have been found",
-                jsonObject.has("AMoreNormalName"));
-        // property name someFloat was replaced by InterfaceField via user-defined annotation
-        assertTrue("Overridden String field name (InterfaceField) should have been found",
-                jsonObject.has("InterfaceField"));
-        // property name ignoredInt was replaced by none, followed by forcedInt via user-defined annotations
-        assertTrue("Forced field should have been found!",
-                jsonObject.has("forcedInt"));
-        // property name able was replaced by Getable via user-defined annotation
-        assertTrue("Overridden boolean field name (Getable) should have been found",
-                jsonObject.has("Getable"));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * A bean is also an object. But in order to test the JSONObject
-     * ctor that takes an object and a list of names, 
-     * this particular bean needs some public
-     * data members, which have been added to the class.
-     */
-    @Test
-    public void jsonObjectByObjectAndNames() {
-        String[] keys = {"publicString", "publicInt"};
-        // just need a class that has public data members
-        MyPublicClass myPublicClass = new MyPublicClass();
-        JSONObject jsonObject = new JSONObject(myPublicClass, keys);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected \"publicString\":\"abc\"", "abc".equals(jsonObject.query("/publicString")));
-        assertTrue("expected \"publicInt\":42", Integer.valueOf(42).equals(jsonObject.query("/publicInt")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercise the JSONObject from resource bundle functionality.
-     * The test resource bundle is uncomplicated, but provides adequate test coverage.
-     */
-    @Test
-    public void jsonObjectByResourceBundle() {
-        JSONObject jsonObject = new
-                JSONObject("org.json.junit.data.StringsResourceBundle",
-                        Locale.getDefault());
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2);
-        assertTrue("expected 2 greetings items", ((Map)(JsonPath.read(doc, "$.greetings"))).size() == 2);
-        assertTrue("expected \"hello\":\"Hello, \"", "Hello, ".equals(jsonObject.query("/greetings/hello")));
-        assertTrue("expected \"world\":\"World!\"", "World!".equals(jsonObject.query("/greetings/world")));
-        assertTrue("expected 2 farewells items", ((Map)(JsonPath.read(doc, "$.farewells"))).size() == 2);
-        assertTrue("expected \"later\":\"Later, \"", "Later, ".equals(jsonObject.query("/farewells/later")));
-        assertTrue("expected \"world\":\"World!\"", "Alligator!".equals(jsonObject.query("/farewells/gator")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-    
-    /**
-     * Exercise the JSONObject.accumulate() method
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void jsonObjectAccumulate() {
-
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.accumulate("myArray", true);
-        jsonObject.accumulate("myArray", false);
-        jsonObject.accumulate("myArray", "hello world!");
-        jsonObject.accumulate("myArray", "h\be\tllo w\u1234orld!");
-        jsonObject.accumulate("myArray", 42);
-        jsonObject.accumulate("myArray", -23.45e7);
-        // include an unsupported object for coverage
-        try {
-            jsonObject.accumulate("myArray", Double.NaN);
-            fail("Expected exception");
-        } catch (JSONException ignored) {}
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected 6 myArray items", ((List)(JsonPath.read(doc, "$.myArray"))).size() == 6);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/myArray/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/myArray/1")));
-        assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/myArray/2")));
-        assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/myArray/3")));
-        assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/myArray/4")));
-        assertTrue("expected -23.45e7", Double.valueOf(-23.45e7).equals(jsonObject.query("/myArray/5")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercise the JSONObject append() functionality
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void jsonObjectAppend() {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.append("myArray", true);
-        jsonObject.append("myArray", false);
-        jsonObject.append("myArray", "hello world!");
-        jsonObject.append("myArray", "h\be\tllo w\u1234orld!");
-        jsonObject.append("myArray", 42);
-        jsonObject.append("myArray", -23.45e7);
-        // include an unsupported object for coverage
-        try {
-            jsonObject.append("myArray", Double.NaN);
-            fail("Expected exception");
-        } catch (JSONException ignored) {}
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected 6 myArray items", ((List)(JsonPath.read(doc, "$.myArray"))).size() == 6);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/myArray/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/myArray/1")));
-        assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/myArray/2")));
-        assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/myArray/3")));
-        assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/myArray/4")));
-        assertTrue("expected -23.45e7", Double.valueOf(-23.45e7).equals(jsonObject.query("/myArray/5")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercise the JSONObject doubleToString() method
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void jsonObjectDoubleToString() {
-        String [] expectedStrs = {"1", "1", "-23.4", "-2.345E68", "null", "null" };
-        Double [] doubles = { 1.0, 00001.00000, -23.4, -23.45e67, 
-                Double.NaN, Double.NEGATIVE_INFINITY };
-        for (int i = 0; i < expectedStrs.length; ++i) {
-            String actualStr = JSONObject.doubleToString(doubles[i]);
-            assertTrue("value expected ["+expectedStrs[i]+
-                    "] found ["+actualStr+ "]",
-                    expectedStrs[i].equals(actualStr));
-        }
-    }
-
-    /**
-     * Exercise some JSONObject get[type] and opt[type] methods
-     */
-    @Test
-    public void jsonObjectValues() {
-        String str = 
-            "{"+
-                "\"trueKey\":true,"+
-                "\"falseKey\":false,"+
-                "\"trueStrKey\":\"true\","+
-                "\"falseStrKey\":\"false\","+
-                "\"stringKey\":\"hello world!\","+
-                "\"intKey\":42,"+
-                "\"intStrKey\":\"43\","+
-                "\"longKey\":1234567890123456789,"+
-                "\"longStrKey\":\"987654321098765432\","+
-                "\"doubleKey\":-23.45e7,"+
-                "\"doubleStrKey\":\"00001.000\","+
-                "\"BigDecimalStrKey\":\"19007199254740993.35481234487103587486413587843213584\","+
-                "\"negZeroKey\":-0.0,"+
-                "\"negZeroStrKey\":\"-0.0\","+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\":{\"myKey\":\"myVal\"}"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-        assertTrue("trueKey should be true", jsonObject.getBoolean("trueKey"));
-        assertTrue("opt trueKey should be true", jsonObject.optBoolean("trueKey"));
-        assertTrue("opt trueKey should be true", jsonObject.optBooleanObject("trueKey"));
-        assertTrue("falseKey should be false", !jsonObject.getBoolean("falseKey"));
-        assertTrue("trueStrKey should be true", jsonObject.getBoolean("trueStrKey"));
-        assertTrue("trueStrKey should be true", jsonObject.optBoolean("trueStrKey"));
-        assertTrue("trueStrKey should be true", jsonObject.optBooleanObject("trueStrKey"));
-        assertTrue("falseStrKey should be false", !jsonObject.getBoolean("falseStrKey"));
-        assertTrue("stringKey should be string",
-            jsonObject.getString("stringKey").equals("hello world!"));
-        assertTrue("doubleKey should be double", 
-                jsonObject.getDouble("doubleKey") == -23.45e7);
-        assertTrue("doubleStrKey should be double", 
-                jsonObject.getDouble("doubleStrKey") == 1);
-        assertTrue("doubleKey can be float", 
-                jsonObject.getFloat("doubleKey") == -23.45e7f);
-        assertTrue("doubleStrKey can be float", 
-                jsonObject.getFloat("doubleStrKey") == 1f);
-        assertTrue("opt doubleKey should be double", 
-                jsonObject.optDouble("doubleKey") == -23.45e7);
-        assertTrue("opt doubleKey with Default should be double", 
-                jsonObject.optDouble("doubleStrKey", Double.NaN) == 1);
-        assertTrue("opt doubleKey should be Double",
-                Double.valueOf(-23.45e7).equals(jsonObject.optDoubleObject("doubleKey")));
-        assertTrue("opt doubleKey with Default should be Double",
-                Double.valueOf(1).equals(jsonObject.optDoubleObject("doubleStrKey", Double.NaN)));
-        assertTrue("opt negZeroKey should be a Double", 
-                jsonObject.opt("negZeroKey") instanceof Double);
-        assertTrue("get negZeroKey should be a Double", 
-                jsonObject.get("negZeroKey") instanceof Double);
-        assertTrue("optNumber negZeroKey should return Double",
-                jsonObject.optNumber("negZeroKey") instanceof Double);
-        assertTrue("optNumber negZeroStrKey should return Double",
-                jsonObject.optNumber("negZeroStrKey") instanceof Double);
-        assertTrue("opt negZeroKey should be double", 
-                Double.compare(jsonObject.optDouble("negZeroKey"), -0.0d) == 0);
-        assertTrue("opt negZeroStrKey with Default should be double", 
-                Double.compare(jsonObject.optDouble("negZeroStrKey"), -0.0d) == 0);
-        assertTrue("opt negZeroKey should be Double",
-                Double.valueOf(-0.0d).equals(jsonObject.optDoubleObject("negZeroKey")));
-        assertTrue("opt negZeroStrKey with Default should be Double",
-                Double.valueOf(-0.0d).equals(jsonObject.optDoubleObject("negZeroStrKey")));
-        assertTrue("optNumber negZeroKey should be -0.0", 
-                Double.compare(jsonObject.optNumber("negZeroKey").doubleValue(), -0.0d) == 0);
-        assertTrue("optNumber negZeroStrKey should be -0.0", 
-                Double.compare(jsonObject.optNumber("negZeroStrKey").doubleValue(), -0.0d) == 0);
-        assertTrue("optFloat doubleKey should be float", 
-                jsonObject.optFloat("doubleKey") == -23.45e7f);
-        assertTrue("optFloat doubleKey with Default should be float", 
-                jsonObject.optFloat("doubleStrKey", Float.NaN) == 1f);
-        assertTrue("optFloat doubleKey should be Float",
-                Float.valueOf(-23.45e7f).equals(jsonObject.optFloatObject("doubleKey")));
-        assertTrue("optFloat doubleKey with Default should be Float",
-                Float.valueOf(1f).equals(jsonObject.optFloatObject("doubleStrKey", Float.NaN)));
-        assertTrue("intKey should be int", 
-                jsonObject.optInt("intKey") == 42);
-        assertTrue("opt intKey should be int", 
-                jsonObject.optInt("intKey", 0) == 42);
-        assertTrue("intKey should be Integer",
-                Integer.valueOf(42).equals(jsonObject.optIntegerObject("intKey")));
-        assertTrue("opt intKey should be Integer",
-                Integer.valueOf(42).equals(jsonObject.optIntegerObject("intKey", 0)));
-        assertTrue("opt intKey with default should be int", 
-                jsonObject.getInt("intKey") == 42);
-        assertTrue("intStrKey should be int", 
-                jsonObject.getInt("intStrKey") == 43);
-        assertTrue("longKey should be long", 
-                jsonObject.getLong("longKey") == 1234567890123456789L);
-        assertTrue("opt longKey should be long", 
-                jsonObject.optLong("longKey") == 1234567890123456789L);
-        assertTrue("opt longKey with default should be long", 
-                jsonObject.optLong("longKey", 0) == 1234567890123456789L);
-        assertTrue("opt longKey should be Long",
-                Long.valueOf(1234567890123456789L).equals(jsonObject.optLongObject("longKey")));
-        assertTrue("opt longKey with default should be Long",
-                Long.valueOf(1234567890123456789L).equals(jsonObject.optLongObject("longKey", 0L)));
-        assertTrue("longStrKey should be long", 
-                jsonObject.getLong("longStrKey") == 987654321098765432L);
-        assertTrue("optNumber int should return Integer",
-                jsonObject.optNumber("intKey") instanceof Integer);
-        assertTrue("optNumber long should return Long",
-                jsonObject.optNumber("longKey") instanceof Long);
-        assertTrue("optNumber double should return BigDecimal",
-                jsonObject.optNumber("doubleKey") instanceof BigDecimal);
-        assertTrue("optNumber Str int should return Integer",
-                jsonObject.optNumber("intStrKey") instanceof Integer);
-        assertTrue("optNumber Str long should return Long",
-                jsonObject.optNumber("longStrKey") instanceof Long);
-        assertTrue("optNumber Str double should return BigDecimal",
-                jsonObject.optNumber("doubleStrKey") instanceof BigDecimal);
-        assertTrue("optNumber BigDecimalStrKey should return BigDecimal",
-                jsonObject.optNumber("BigDecimalStrKey") instanceof BigDecimal);
-        assertTrue("xKey should not exist",
-                jsonObject.isNull("xKey"));
-        assertTrue("stringKey should exist",
-                jsonObject.has("stringKey"));
-        assertTrue("opt stringKey should string",
-                jsonObject.optString("stringKey").equals("hello world!"));
-        assertTrue("opt stringKey with default should string",
-                jsonObject.optString("stringKey", "not found").equals("hello world!"));
-        JSONArray jsonArray = jsonObject.getJSONArray("arrayKey");
-        assertTrue("arrayKey should be JSONArray", 
-                jsonArray.getInt(0) == 0 &&
-                jsonArray.getInt(1) == 1 &&
-                jsonArray.getInt(2) == 2);
-        jsonArray = jsonObject.optJSONArray("arrayKey");
-        assertTrue("opt arrayKey should be JSONArray", 
-                jsonArray.getInt(0) == 0 &&
-                jsonArray.getInt(1) == 1 &&
-                jsonArray.getInt(2) == 2);
-        JSONObject jsonObjectInner = jsonObject.getJSONObject("objectKey");
-        assertTrue("objectKey should be JSONObject", 
-                jsonObjectInner.get("myKey").equals("myVal"));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Check whether JSONObject handles large or high precision numbers correctly
-     */
-    @Test
-    public void stringToValueNumbersTest() {
-        assertTrue("-0 Should be a Double!",JSONObject.stringToValue("-0")  instanceof Double);
-        assertTrue("-0.0 Should be a Double!",JSONObject.stringToValue("-0.0") instanceof Double);
-        assertTrue("'-' Should be a String!",JSONObject.stringToValue("-") instanceof String);
-        assertTrue( "0.2 should be a BigDecimal!",
-                JSONObject.stringToValue( "0.2" ) instanceof BigDecimal );
-        assertTrue( "Doubles should be BigDecimal, even when incorrectly converting floats!",
-                JSONObject.stringToValue( Double.valueOf( "0.2f" ).toString() ) instanceof BigDecimal );
-        /**
-         * This test documents a need for BigDecimal conversion.
-         */
-        Object obj = JSONObject.stringToValue( "299792.457999999984" );
-        assertTrue( "does not evaluate to 299792.457999999984 BigDecimal!",
-                 obj.equals(new BigDecimal("299792.457999999984")) );
-        assertTrue( "1 should be an Integer!",
-                JSONObject.stringToValue( "1" ) instanceof Integer );
-        assertTrue( "Integer.MAX_VALUE should still be an Integer!",
-                JSONObject.stringToValue( Integer.valueOf( Integer.MAX_VALUE ).toString() ) instanceof Integer );
-        assertTrue( "Large integers should be a Long!",
-                JSONObject.stringToValue( Long.valueOf(((long)Integer.MAX_VALUE) + 1 ) .toString() ) instanceof Long );
-        assertTrue( "Long.MAX_VALUE should still be an Integer!",
-                JSONObject.stringToValue( Long.valueOf( Long.MAX_VALUE ).toString() ) instanceof Long );
-
-        String str = new BigInteger( Long.valueOf( Long.MAX_VALUE ).toString() ).add( BigInteger.ONE ).toString();
-        assertTrue( "Really large integers currently evaluate to BigInteger",
-                JSONObject.stringToValue(str).equals(new BigInteger("9223372036854775808")));
-    }
-
-    /**
-     * This test documents numeric values which could be numerically
-     * handled as BigDecimal or BigInteger. It helps determine what outputs
-     * will change if those types are supported.
-     */
-    @Test
-    public void jsonValidNumberValuesNeitherLongNorIEEE754Compatible() {
-        // Valid JSON Numbers, probably should return BigDecimal or BigInteger objects
-        String str = 
-            "{"+
-                "\"numberWithDecimals\":299792.457999999984,"+
-                "\"largeNumber\":12345678901234567890,"+
-                "\"preciseNumber\":0.2000000000000000111,"+
-                "\"largeExponent\":-23.45e2327"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-        // Comes back as a double, but loses precision
-        assertTrue( "numberWithDecimals currently evaluates to double 299792.458",
-                jsonObject.get( "numberWithDecimals" ).equals( new BigDecimal( "299792.457999999984" ) ) );
-        Object obj = jsonObject.get( "largeNumber" );
-        assertTrue("largeNumber currently evaluates to BigInteger",
-                new BigInteger("12345678901234567890").equals(obj));
-        // comes back as a double but loses precision
-        assertEquals( "preciseNumber currently evaluates to double 0.2",
-                0.2, jsonObject.getDouble( "preciseNumber" ), 0.0);
-        obj = jsonObject.get( "largeExponent" );
-        assertTrue("largeExponent should evaluate as a BigDecimal",
-                new BigDecimal("-23.45e2327").equals(obj));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * This test documents how JSON-Java handles invalid numeric input.
-     */
-    @Test
-    public void jsonInvalidNumberValues() {
-        // Number-notations supported by Java and invalid as JSON
-        String str =
-                "{" +
-                        "\"hexNumber\":-0x123," +
-                        "\"tooManyZeros\":00," +
-                        "\"negativeInfinite\":-Infinity," +
-                        "\"negativeNaN\":-NaN," +
-                        "\"negativeFraction\":-.01," +
-                        "\"tooManyZerosFraction\":00.001," +
-                        "\"negativeHexFloat\":-0x1.fffp1," +
-                        "\"hexFloat\":0x1.0P-1074," +
-                        "\"floatIdentifier\":0.1f," +
-                        "\"doubleIdentifier\":0.1d" +
-                        "}";
-
-        // Test should fail if default strictMode is true, pass if false
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
-        if (jsonParserConfiguration.isStrictMode()) {
-            try {
-                JSONObject jsonObject = new JSONObject(str);
-                assertEquals("Expected to throw exception due to invalid string", true, false);
-            } catch (JSONException e) { }
-        } else {
-            JSONObject jsonObject = new JSONObject(str);
-            Object obj;
-            obj = jsonObject.get("hexNumber");
-            assertFalse("hexNumber must not be a number (should throw exception!?)",
-                    obj instanceof Number);
-            assertTrue("hexNumber currently evaluates to string",
-                    obj.equals("-0x123"));
-            assertTrue("tooManyZeros currently evaluates to string",
-                    jsonObject.get("tooManyZeros").equals("00"));
-            obj = jsonObject.get("negativeInfinite");
-            assertTrue("negativeInfinite currently evaluates to string",
-                    obj.equals("-Infinity"));
-            obj = jsonObject.get("negativeNaN");
-            assertTrue("negativeNaN currently evaluates to string",
-                    obj.equals("-NaN"));
-            assertTrue("negativeFraction currently evaluates to double -0.01",
-                    jsonObject.get("negativeFraction").equals(BigDecimal.valueOf(-0.01)));
-            assertTrue("tooManyZerosFraction currently evaluates to double 0.001",
-                    jsonObject.optLong("tooManyZerosFraction") == 0);
-            assertTrue("negativeHexFloat currently evaluates to double -3.99951171875",
-                    jsonObject.get("negativeHexFloat").equals(Double.valueOf(-3.99951171875)));
-            assertTrue("hexFloat currently evaluates to double 4.9E-324",
-                    jsonObject.get("hexFloat").equals(Double.valueOf(4.9E-324)));
-            assertTrue("floatIdentifier currently evaluates to double 0.1",
-                    jsonObject.get("floatIdentifier").equals(Double.valueOf(0.1)));
-            assertTrue("doubleIdentifier currently evaluates to double 0.1",
-                    jsonObject.get("doubleIdentifier").equals(Double.valueOf(0.1)));
-            Util.checkJSONObjectMaps(jsonObject);
-        }
-    }
-
-    /**
-     * Tests how JSONObject get[type] handles incorrect types
-     */
-    @Test
-    public void jsonObjectNonAndWrongValues() {
-        String str = 
-            "{"+
-                "\"trueKey\":true,"+
-                "\"falseKey\":false,"+
-                "\"trueStrKey\":\"true\","+
-                "\"falseStrKey\":\"false\","+
-                "\"stringKey\":\"hello world!\","+
-                "\"intKey\":42,"+
-                "\"intStrKey\":\"43\","+
-                "\"longKey\":1234567890123456789,"+
-                "\"longStrKey\":\"987654321098765432\","+
-                "\"doubleKey\":-23.45e7,"+
-                "\"doubleStrKey\":\"00001.000\","+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\":{\"myKey\":\"myVal\"}"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-        try {
-            jsonObject.getBoolean("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("expecting an exception message", 
-                    "JSONObject[\"nonKey\"] not found.", e.getMessage());
-        }
-        try {
-            jsonObject.getBoolean("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a Boolean (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getString("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getString("trueKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"trueKey\"] is not a string (class java.lang.Boolean : true).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getDouble("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getDouble("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"stringKey\"] is not a double (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getFloat("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getFloat("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"stringKey\"] is not a float (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getInt("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getInt("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a int (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getLong("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getLong("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a long (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getJSONArray("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getJSONArray("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a JSONArray (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getJSONObject("nonKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"nonKey\"] not found.",
-                    e.getMessage());
-        }
-        try {
-            jsonObject.getJSONObject("stringKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a JSONObject (class java.lang.String : hello world!).",
-                    e.getMessage());
-        }
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * This test documents an unexpected numeric behavior.
-     * A double that ends with .0 is parsed, serialized, then
-     * parsed again. On the second parse, it has become an int.
-     */
-    @Test
-    public void unexpectedDoubleToIntConversion() {
-        String key30 = "key30";
-        String key31 = "key31";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put(key30, Double.valueOf(3.0));
-        jsonObject.put(key31, Double.valueOf(3.1));
-
-        assertTrue("3.0 should remain a double",
-                jsonObject.getDouble(key30) == 3); 
-        assertTrue("3.1 should remain a double",
-                jsonObject.getDouble(key31) == 3.1); 
- 
-        // turns 3.0 into 3.
-        String serializedString = jsonObject.toString();
-        JSONObject deserialized = new JSONObject(serializedString);
-        assertTrue("3.0 is now an int", deserialized.get(key30) instanceof Integer);
-        assertTrue("3.0 can still be interpreted as a double",
-                deserialized.getDouble(key30) == 3.0);
-        assertTrue("3.1 remains a double", deserialized.getDouble(key31) == 3.1);
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Document behaviors of big numbers. Includes both JSONObject
-     * and JSONArray tests
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void bigNumberOperations() {
-        /**
-         * JSONObject tries to parse BigInteger as a bean, but it only has
-         * one getter, getLowestBitSet(). The value is lost and an unhelpful
-         * value is stored. This should be fixed.
-         */
-        BigInteger bigInteger = new BigInteger("123456789012345678901234567890");
-        JSONObject jsonObject0 = new JSONObject(bigInteger);
-        Object obj = jsonObject0.get("lowestSetBit");
-        assertTrue("JSONObject only has 1 value", jsonObject0.length() == 1);
-        assertTrue("JSONObject parses BigInteger as the Integer lowestBitSet",
-                obj instanceof Integer);
-        assertTrue("this bigInteger lowestBitSet happens to be 1",
-                obj.equals(1));
-
-        /**
-         * JSONObject tries to parse BigDecimal as a bean, but it has
-         * no getters, The value is lost and no value is stored.
-         * This should be fixed.
-         */
-        BigDecimal bigDecimal = new BigDecimal(
-                "123456789012345678901234567890.12345678901234567890123456789");
-        JSONObject jsonObject1 = new JSONObject(bigDecimal);
-        assertTrue("large bigDecimal is not stored", jsonObject1.isEmpty());
-
-        /**
-         * JSONObject put(String, Object) method stores and serializes
-         * bigInt and bigDec correctly. Nothing needs to change. 
-         */
-        JSONObject jsonObject2 = new JSONObject();
-        jsonObject2.put("bigInt", bigInteger);
-        assertTrue("jsonObject.put() handles bigInt correctly",
-                jsonObject2.get("bigInt").equals(bigInteger));
-        assertTrue("jsonObject.getBigInteger() handles bigInt correctly",
-                jsonObject2.getBigInteger("bigInt").equals(bigInteger));
-        assertTrue("jsonObject.optBigInteger() handles bigInt correctly",
-                jsonObject2.optBigInteger("bigInt", BigInteger.ONE).equals(bigInteger));
-        assertTrue("jsonObject serializes bigInt correctly",
-                jsonObject2.toString().equals("{\"bigInt\":123456789012345678901234567890}"));
-        assertTrue("BigInteger as BigDecimal",
-                jsonObject2.getBigDecimal("bigInt").equals(new BigDecimal(bigInteger)));
-
-        
-        JSONObject jsonObject3 = new JSONObject();
-        jsonObject3.put("bigDec", bigDecimal);
-        assertTrue("jsonObject.put() handles bigDec correctly",
-                jsonObject3.get("bigDec").equals(bigDecimal));
-        assertTrue("jsonObject.getBigDecimal() handles bigDec correctly",
-                jsonObject3.getBigDecimal("bigDec").equals(bigDecimal));
-        assertTrue("jsonObject.optBigDecimal() handles bigDec correctly",
-                jsonObject3.optBigDecimal("bigDec", BigDecimal.ONE).equals(bigDecimal));
-        assertTrue("jsonObject serializes bigDec correctly",
-                jsonObject3.toString().equals(
-                "{\"bigDec\":123456789012345678901234567890.12345678901234567890123456789}"));
-
-        assertTrue("BigDecimal as BigInteger",
-                jsonObject3.getBigInteger("bigDec").equals(bigDecimal.toBigInteger()));
-        /**
-         * exercise some exceptions
-         */
-        try {
-            // bigInt key does not exist
-            jsonObject3.getBigDecimal("bigInt");
-            fail("expected an exeption");
-        } catch (JSONException ignored) {}
-        obj = jsonObject3.optBigDecimal("bigInt", BigDecimal.ONE);
-        assertTrue("expected BigDecimal", obj.equals(BigDecimal.ONE));
-        jsonObject3.put("stringKey",  "abc");
-        try {
-            jsonObject3.getBigDecimal("stringKey");
-            fail("expected an exeption");
-        } catch (JSONException ignored) {}
-        obj = jsonObject3.optBigInteger("bigDec", BigInteger.ONE);
-        assertTrue("expected BigInteger", obj instanceof BigInteger);
-        assertEquals(bigDecimal.toBigInteger(), obj);
-
-        /**
-         * JSONObject.numberToString() works correctly, nothing to change.
-         */
-        String str = JSONObject.numberToString(bigInteger);
-        assertTrue("numberToString() handles bigInteger correctly",
-                str.equals("123456789012345678901234567890"));
-        str = JSONObject.numberToString(bigDecimal);
-        assertTrue("numberToString() handles bigDecimal correctly",
-                str.equals("123456789012345678901234567890.12345678901234567890123456789"));
-
-        /**
-         * JSONObject.stringToValue() turns bigInt into an accurate string,
-         * and rounds bigDec. This incorrect, but users may have come to 
-         * expect this behavior. Change would be marginally better, but 
-         * might inconvenience users.
-         */
-        obj = JSONObject.stringToValue(bigInteger.toString());
-        assertTrue("stringToValue() turns bigInteger string into Number",
-                obj instanceof Number);
-        obj = JSONObject.stringToValue(bigDecimal.toString());
-        assertTrue("stringToValue() changes bigDecimal Number",
-                obj instanceof Number);
-
-        /**
-         * wrap() vs put() big number behavior is now the same.
-         */
-        // bigInt map ctor 
-        Map map = new HashMap();
-        map.put("bigInt", bigInteger);
-        JSONObject jsonObject4 = new JSONObject(map);
-        String actualFromMapStr = jsonObject4.toString();
-        assertTrue("bigInt in map (or array or bean) is a string",
-                actualFromMapStr.equals(
-                "{\"bigInt\":123456789012345678901234567890}"));
-        // bigInt put
-        JSONObject jsonObject5 = new JSONObject();
-        jsonObject5.put("bigInt", bigInteger);
-        String actualFromPutStr = jsonObject5.toString();
-        assertTrue("bigInt from put is a number",
-                actualFromPutStr.equals(
-                "{\"bigInt\":123456789012345678901234567890}"));
-        // bigDec map ctor
-        map = new HashMap();
-        map.put("bigDec", bigDecimal);
-        JSONObject jsonObject6 = new JSONObject(map);
-        actualFromMapStr = jsonObject6.toString();
-        assertTrue("bigDec in map (or array or bean) is a bigDec",
-                actualFromMapStr.equals(
-                "{\"bigDec\":123456789012345678901234567890.12345678901234567890123456789}"));
-        // bigDec put
-        JSONObject jsonObject7 = new JSONObject();
-        jsonObject7.put("bigDec", bigDecimal);
-        actualFromPutStr = jsonObject7.toString();
-        assertTrue("bigDec from put is a number",
-                actualFromPutStr.equals(
-                "{\"bigDec\":123456789012345678901234567890.12345678901234567890123456789}"));
-        // bigInt,bigDec put 
-        JSONArray jsonArray0 = new JSONArray();
-        jsonArray0.put(bigInteger);
-        jsonArray0.put(bigDecimal);
-        actualFromPutStr = jsonArray0.toString();
-        assertTrue("bigInt, bigDec from put is a number",
-                actualFromPutStr.equals(
-                "[123456789012345678901234567890,123456789012345678901234567890.12345678901234567890123456789]"));
-        assertTrue("getBigInt is bigInt", jsonArray0.getBigInteger(0).equals(bigInteger));
-        assertTrue("getBigDec is bigDec", jsonArray0.getBigDecimal(1).equals(bigDecimal));
-        assertTrue("optBigInt is bigInt", jsonArray0.optBigInteger(0, BigInteger.ONE).equals(bigInteger));
-        assertTrue("optBigDec is bigDec", jsonArray0.optBigDecimal(1, BigDecimal.ONE).equals(bigDecimal));
-        jsonArray0.put(Boolean.TRUE);
-        try {
-            jsonArray0.getBigInteger(2);
-            fail("should not be able to get big int");
-        } catch (Exception ignored) {}
-        try {
-            jsonArray0.getBigDecimal(2);
-            fail("should not be able to get big dec");
-        } catch (Exception ignored) {}
-        assertTrue("optBigInt is default", jsonArray0.optBigInteger(2, BigInteger.ONE).equals(BigInteger.ONE));
-        assertTrue("optBigDec is default", jsonArray0.optBigDecimal(2, BigDecimal.ONE).equals(BigDecimal.ONE));
-
-        // bigInt,bigDec list ctor
-        List list = new ArrayList();
-        list.add(bigInteger);
-        list.add(bigDecimal);
-        JSONArray jsonArray1 = new JSONArray(list);
-        String actualFromListStr = jsonArray1.toString();
-        assertTrue("bigInt, bigDec in list is a bigInt, bigDec",
-                actualFromListStr.equals(
-                "[123456789012345678901234567890,123456789012345678901234567890.12345678901234567890123456789]"));
-        // bigInt bean ctor
-        MyBigNumberBean myBigNumberBean = mock(MyBigNumberBean.class);
-        when(myBigNumberBean.getBigInteger()).thenReturn(new BigInteger("123456789012345678901234567890"));
-        JSONObject jsonObject8 = new JSONObject(myBigNumberBean);
-        String actualFromBeanStr = jsonObject8.toString();
-        // can't do a full string compare because mockery adds an extra key/value
-        assertTrue("bigInt from bean ctor is a bigInt",
-                actualFromBeanStr.contains("123456789012345678901234567890"));
-        // bigDec bean ctor
-        myBigNumberBean = mock(MyBigNumberBean.class);
-        when(myBigNumberBean.getBigDecimal()).thenReturn(new BigDecimal("123456789012345678901234567890.12345678901234567890123456789"));
-        jsonObject8 = new JSONObject(myBigNumberBean);
-        actualFromBeanStr = jsonObject8.toString();
-        // can't do a full string compare because mockery adds an extra key/value
-        assertTrue("bigDec from bean ctor is a bigDec",
-                actualFromBeanStr.contains("123456789012345678901234567890.12345678901234567890123456789"));
-        // bigInt,bigDec wrap()
-        obj = JSONObject.wrap(bigInteger);
-        assertTrue("wrap() returns big num",obj.equals(bigInteger));
-        obj = JSONObject.wrap(bigDecimal);
-        assertTrue("wrap() returns string",obj.equals(bigDecimal));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject0, jsonObject1, jsonObject2, jsonObject3, jsonObject4,
-                jsonObject5, jsonObject6, jsonObject7, jsonObject8
-        )));
-        Util.checkJSONArrayMaps(jsonArray0, jsonObject0.getMapType());
-        Util.checkJSONArrayMaps(jsonArray1, jsonObject0.getMapType());
-    }
-
-    /**
-     * The purpose for the static method getNames() methods are not clear.
-     * This method is not called from within JSON-Java. Most likely
-     * uses are to prep names arrays for:  
-     * JSONObject(JSONObject jo, String[] names)
-     * JSONObject(Object object, String names[]),
-     */
-    @Test
-    public void jsonObjectNames() {
-
-        // getNames() from null JSONObject
-        assertTrue("null names from null Object", 
-                null == JSONObject.getNames((Object)null));
-
-        // getNames() from object with no fields
-        assertTrue("null names from Object with no fields", 
-                null == JSONObject.getNames(new MyJsonString()));
-
-        // getNames from new JSONOjbect
-        JSONObject jsonObject0 = new JSONObject();
-        String [] names = JSONObject.getNames(jsonObject0);
-        assertTrue("names should be null", names == null);
-
-        
-        // getNames() from empty JSONObject
-        String emptyStr = "{}";
-        JSONObject jsonObject1 = new JSONObject(emptyStr);
-        assertTrue("empty JSONObject should have null names",
-                null == JSONObject.getNames(jsonObject1));
-
-        // getNames() from JSONObject
-        String str = 
-            "{"+
-                "\"trueKey\":true,"+
-                "\"falseKey\":false,"+
-                "\"stringKey\":\"hello world!\""+
-            "}";
-        JSONObject jsonObject2 = new JSONObject(str);
-        names = JSONObject.getNames(jsonObject2);
-        JSONArray jsonArray0 = new JSONArray(names);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonArray0.toString());
-        List docList = JsonPath.read(doc, "$");
-        assertTrue("expected 3 items", docList.size() == 3);
-        assertTrue(
-                "expected to find trueKey",
-                ((List) JsonPath.read(doc, "$[?(@=='trueKey')]")).size() == 1);
-        assertTrue(
-                "expected to find falseKey",
-                ((List) JsonPath.read(doc, "$[?(@=='falseKey')]")).size() == 1);
-        assertTrue(
-                "expected to find stringKey",
-                ((List) JsonPath.read(doc, "$[?(@=='stringKey')]")).size() == 1);
-
-        /**
-         * getNames() from an enum with properties has an interesting result.
-         * It returns the enum values, not the selected enum properties
-         */
-        MyEnumField myEnumField = MyEnumField.VAL1;
-        names = JSONObject.getNames(myEnumField);
-
-        // validate JSON
-        JSONArray jsonArray1 = new JSONArray(names);
-        doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonArray1.toString());
-        docList = JsonPath.read(doc, "$");
-        assertTrue("expected 3 items", docList.size() == 3);
-        assertTrue(
-                "expected to find VAL1",
-                ((List) JsonPath.read(doc, "$[?(@=='VAL1')]")).size() == 1);
-        assertTrue(
-                "expected to find VAL2",
-                ((List) JsonPath.read(doc, "$[?(@=='VAL2')]")).size() == 1);
-        assertTrue(
-                "expected to find VAL3",
-                ((List) JsonPath.read(doc, "$[?(@=='VAL3')]")).size() == 1);
-
-        /**
-         * A bean is also an object. But in order to test the static
-         * method getNames(), this particular bean needs some public
-         * data members.
-         */
-        MyPublicClass myPublicClass = new MyPublicClass();
-        names = JSONObject.getNames(myPublicClass);
-
-        // validate JSON
-        JSONArray jsonArray2 = new JSONArray(names);
-        doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonArray2.toString());
-        docList = JsonPath.read(doc, "$");
-        assertTrue("expected 2 items", docList.size() == 2);
-        assertTrue(
-                "expected to find publicString",
-                ((List) JsonPath.read(doc, "$[?(@=='publicString')]")).size() == 1);
-        assertTrue(
-                "expected to find publicInt",
-                ((List) JsonPath.read(doc, "$[?(@=='publicInt')]")).size() == 1);
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject0, jsonObject1, jsonObject2
-        )));
-        Util.checkJSONArrayMaps(jsonArray0, jsonObject0.getMapType());
-        Util.checkJSONArrayMaps(jsonArray1, jsonObject0.getMapType());
-        Util.checkJSONArrayMaps(jsonArray2, jsonObject0.getMapType());
-    }
-
-    /**
-     * Populate a JSONArray from an empty JSONObject names() method.
-     * It should be empty.
-     */
-    @Test
-    public void emptyJsonObjectNamesToJsonAray() {
-        JSONObject jsonObject = new JSONObject();
-        JSONArray jsonArray = jsonObject.names();
-        assertTrue("jsonArray should be null", jsonArray == null);
-        Util.checkJSONObjectMaps(jsonObject);
-        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
-    }
-
-    /**
-     * Populate a JSONArray from a JSONObject names() method.
-     * Confirm that it contains the expected names.
-     */
-    @Test
-    public void jsonObjectNamesToJsonAray() {
-        String str = 
-            "{"+
-                "\"trueKey\":true,"+
-                "\"falseKey\":false,"+
-                "\"stringKey\":\"hello world!\""+
-            "}";
-
-        JSONObject jsonObject = new JSONObject(str);
-        JSONArray jsonArray = jsonObject.names();
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 3 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected to find trueKey", ((List) JsonPath.read(doc, "$[?(@=='trueKey')]")).size() == 1);
-        assertTrue("expected to find falseKey", ((List) JsonPath.read(doc, "$[?(@=='falseKey')]")).size() == 1);
-        assertTrue("expected to find stringKey", ((List) JsonPath.read(doc, "$[?(@=='stringKey')]")).size() == 1);
-        Util.checkJSONObjectMaps(jsonObject);
-        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
-    }
-
-    /**
-     * Exercise the JSONObject increment() method.
-     */
-    @SuppressWarnings("cast")
-    @Test
-    public void jsonObjectIncrement() {
-        String str = 
-            "{"+
-                "\"keyLong\":9999999991,"+
-                "\"keyDouble\":1.1"+
-             "}";
-        JSONObject jsonObject = new JSONObject(str);
-        jsonObject.increment("keyInt");
-        jsonObject.increment("keyInt");
-        jsonObject.increment("keyLong");
-        jsonObject.increment("keyDouble");
-        jsonObject.increment("keyInt");
-        jsonObject.increment("keyLong");
-        jsonObject.increment("keyDouble");
-        /**
-         * JSONObject constructor won't handle these types correctly, but
-         * adding them via put works.
-         */
-        jsonObject.put("keyFloat", 1.1f);
-        jsonObject.put("keyBigInt", new BigInteger("123456789123456789123456789123456780"));
-        jsonObject.put("keyBigDec", new BigDecimal("123456789123456789123456789123456780.1"));
-        jsonObject.increment("keyFloat");
-        jsonObject.increment("keyFloat");
-        jsonObject.increment("keyBigInt");
-        jsonObject.increment("keyBigDec");
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected 3", Integer.valueOf(3).equals(jsonObject.query("/keyInt")));
-        assertTrue("expected 9999999993", Long.valueOf(9999999993L).equals(jsonObject.query("/keyLong")));
-        assertTrue("expected 3.1", BigDecimal.valueOf(3.1).equals(jsonObject.query("/keyDouble")));
-        assertTrue("expected 123456789123456789123456789123456781", new BigInteger("123456789123456789123456789123456781").equals(jsonObject.query("/keyBigInt")));
-        assertTrue("expected 123456789123456789123456789123456781.1", new BigDecimal("123456789123456789123456789123456781.1").equals(jsonObject.query("/keyBigDec")));
-
-        /**
-         * Should work the same way on any platform! @see https://docs.oracle
-         * .com/javase/specs/jls/se7/html/jls-4.html#jls-4.2.3 This is the
-         * effect of a float to double conversion and is inherent to the
-         * shortcomings of the IEEE 754 format, when converting 32-bit into
-         * double-precision 64-bit. Java type-casts float to double. A 32 bit
-         * float is type-casted to 64 bit double by simply appending zero-bits
-         * to the mantissa (and extended the signed exponent by 3 bits.) and
-         * there is no way to obtain more information than it is stored in the
-         * 32-bits float.
-         * 
-         * Like 1/3 cannot be represented as base10 number because it is
-         * periodically, 1/5 (for example) cannot be represented as base2 number
-         * since it is periodically in base2 (take a look at
-         * http://www.h-schmidt.net/FloatConverter/) The same happens to 3.1,
-         * that decimal number (base10 representation) is periodic in base2
-         * representation, therefore appending zero-bits is inaccurate. Only
-         * repeating the periodically occurring bits (0110) would be a proper
-         * conversion. However one cannot detect from a 32 bit IEE754
-         * representation which bits would "repeat infinitely", since the
-         * missing bits would not fit into the 32 bit float, i.e. the
-         * information needed simply is not there!
-         */
-        assertEquals(Float.valueOf(3.1f), jsonObject.query("/keyFloat"));
-
-        /**
-         * float f = 3.1f; double df = (double) f; double d = 3.1d;
-         * System.out.println
-         * (Integer.toBinaryString(Float.floatToRawIntBits(f)));
-         * System.out.println
-         * (Long.toBinaryString(Double.doubleToRawLongBits(df)));
-         * System.out.println
-         * (Long.toBinaryString(Double.doubleToRawLongBits(d)));
-         * 
-         * - Float:
-         * seeeeeeeemmmmmmmmmmmmmmmmmmmmmmm
-         * 1000000010001100110011001100110
-         * - Double
-         * seeeeeeeeeeemmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-         * 10000000   10001100110011001100110
-         * 100000000001000110011001100110011000000000000000000000000000000
-         * 100000000001000110011001100110011001100110011001100110011001101
-         */
-
-        /**
-        * Examples of well documented but probably unexpected behavior in 
-        * java / with 32-bit float to 64-bit float conversion.
-        */
-        assertFalse("Document unexpected behaviour with explicit type-casting float as double!", (double)0.2f == 0.2d );
-        assertFalse("Document unexpected behaviour with implicit type-cast!", 0.2f == 0.2d );
-        Double d1 = Double.valueOf( 1.1f );
-        Double d2 = Double.valueOf( "1.1f" );
-        assertFalse( "Document implicit type cast from float to double before calling Double(double d) constructor", d1.equals( d2 ) );
-
-        assertTrue( "Correctly converting float to double via base10 (string) representation!", Double.valueOf( 3.1d ).equals(  Double.valueOf( Float.valueOf( 3.1f ).toString() ) ) );
-
-        // Pinpointing the not so obvious "buggy" conversion from float to double in JSONObject
-        JSONObject jo = new JSONObject();
-        jo.put( "bug", 3.1f ); // will call put( String key, double value ) with implicit and "buggy" type-cast from float to double
-        assertFalse( "The java-compiler did add some zero bits for you to the mantissa (unexpected, but well documented)", jo.get( "bug" ).equals(  Double.valueOf( 3.1d ) ) );
-
-        JSONObject inc = new JSONObject();
-        inc.put( "bug", Float.valueOf( 3.1f ) ); // This will put in instance of Float into JSONObject, i.e. call put( String key, Object value )
-        assertTrue( "Everything is ok here!", inc.get( "bug" ) instanceof Float );
-        inc.increment( "bug" ); // after adding 1, increment will call put( String key, double value ) with implicit and "buggy" type-cast from float to double!
-        // this.put(key, (Float) value + 1);
-        // 1.        The (Object)value will be typecasted to (Float)value since it is an instanceof Float actually nothing is done. 
-        // 2.        Float instance will be autoboxed into float because the + operator will work on primitives not Objects!
-        // 3.        A float+float operation will be performed and results into a float primitive.
-        // 4.        There is no method that matches the signature put( String key, float value), java-compiler will choose the method
-        //                put( String key, double value) and does an implicit type-cast(!) by appending zero-bits to the mantissa
-        assertTrue( "JSONObject increment converts Float to Double", jo.get( "bug" ) instanceof Float );
-        // correct implementation (with change of behavior) would be:
-        // this.put(key, new Float((Float) value + 1)); 
-        // Probably it would be better to deprecate the method and remove some day, while convenient processing the "payload" is not
-        // really in the scope of a JSON-library (IMHO.)
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject, inc
-        )));
-    }
-
-    /**
-     * Exercise JSONObject numberToString() method
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void jsonObjectNumberToString() {
-        String str;
-        Double dVal;
-        Integer iVal = 1;
-        str = JSONObject.numberToString(iVal);
-        assertTrue("expected "+iVal+" actual "+str, iVal.toString().equals(str));
-        dVal = 12.34;
-        str = JSONObject.numberToString(dVal);
-        assertTrue("expected "+dVal+" actual "+str, dVal.toString().equals(str));
-        dVal = 12.34e27;
-        str = JSONObject.numberToString(dVal);
-        assertTrue("expected "+dVal+" actual "+str, dVal.toString().equals(str));
-        // trailing .0 is truncated, so it doesn't quite match toString()
-        dVal = 5000000.0000000;
-        str = JSONObject.numberToString(dVal);
-        assertTrue("expected 5000000 actual "+str, str.equals("5000000"));
-    }
-
-    /**
-     * Exercise JSONObject put() and similar() methods
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void jsonObjectPut() {
-        String expectedStr = 
-            "{"+
-                "\"trueKey\":true,"+
-                "\"falseKey\":false,"+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\":{"+
-                    "\"myKey1\":\"myVal1\","+
-                    "\"myKey2\":\"myVal2\","+
-                    "\"myKey3\":\"myVal3\","+
-                    "\"myKey4\":\"myVal4\""+
-                "}"+
-            "}";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("trueKey", true);
-        jsonObject.put("falseKey", false);
-        Integer [] intArray = { 0, 1, 2 };
-        jsonObject.put("arrayKey", Arrays.asList(intArray));
-        Map myMap = new HashMap();
-        myMap.put("myKey1", "myVal1");
-        myMap.put("myKey2", "myVal2");
-        myMap.put("myKey3", "myVal3");
-        myMap.put("myKey4", "myVal4");
-        jsonObject.put("objectKey", myMap);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 4 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 4);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueKey")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseKey")));
-        assertTrue("expected 3 arrayKey items", ((List)(JsonPath.read(doc, "$.arrayKey"))).size() == 3);
-        assertTrue("expected 0", Integer.valueOf(0).equals(jsonObject.query("/arrayKey/0")));
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonObject.query("/arrayKey/1")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/arrayKey/2")));
-        assertTrue("expected 4 objectKey items", ((Map)(JsonPath.read(doc, "$.objectKey"))).size() == 4);
-        assertTrue("expected myVal1", "myVal1".equals(jsonObject.query("/objectKey/myKey1")));
-        assertTrue("expected myVal2", "myVal2".equals(jsonObject.query("/objectKey/myKey2")));
-        assertTrue("expected myVal3", "myVal3".equals(jsonObject.query("/objectKey/myKey3")));
-        assertTrue("expected myVal4", "myVal4".equals(jsonObject.query("/objectKey/myKey4")));
-
-        jsonObject.remove("trueKey");
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        assertTrue("unequal jsonObjects should not be similar",
-                !jsonObject.similar(expectedJsonObject));
-        assertTrue("jsonObject should not be similar to jsonArray",
-                !jsonObject.similar(new JSONArray()));
-
-        String aCompareValueStr = "{\"a\":\"aval\",\"b\":true}";
-        String bCompareValueStr = "{\"a\":\"notAval\",\"b\":true}";
-        JSONObject aCompareValueJsonObject = new JSONObject(aCompareValueStr);
-        JSONObject bCompareValueJsonObject = new JSONObject(bCompareValueStr);
-        assertTrue("different values should not be similar",
-                !aCompareValueJsonObject.similar(bCompareValueJsonObject));
-
-        String aCompareObjectStr = "{\"a\":\"aval\",\"b\":{}}";
-        String bCompareObjectStr = "{\"a\":\"aval\",\"b\":true}";
-        JSONObject aCompareObjectJsonObject = new JSONObject(aCompareObjectStr);
-        JSONObject bCompareObjectJsonObject = new JSONObject(bCompareObjectStr);
-        assertTrue("different nested JSONObjects should not be similar",
-                !aCompareObjectJsonObject.similar(bCompareObjectJsonObject));
-
-        String aCompareArrayStr = "{\"a\":\"aval\",\"b\":[]}";
-        String bCompareArrayStr = "{\"a\":\"aval\",\"b\":true}";
-        JSONObject aCompareArrayJsonObject = new JSONObject(aCompareArrayStr);
-        JSONObject bCompareArrayJsonObject = new JSONObject(bCompareArrayStr);
-        assertTrue("different nested JSONArrays should not be similar",
-                !aCompareArrayJsonObject.similar(bCompareArrayJsonObject));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject, expectedJsonObject, aCompareValueJsonObject,
-                aCompareArrayJsonObject, aCompareObjectJsonObject, aCompareArrayJsonObject,
-                bCompareValueJsonObject, bCompareArrayJsonObject, bCompareObjectJsonObject,
-                bCompareArrayJsonObject
-        )));
-    }
-
-    /**
-     * Exercise JSONObject toString() method
-     */
-    @Test
-    public void jsonObjectToString() {
-        String str = 
-            "{"+
-                "\"trueKey\":true,"+
-                "\"falseKey\":false,"+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\":{"+
-                    "\"myKey1\":\"myVal1\","+
-                    "\"myKey2\":\"myVal2\","+
-                    "\"myKey3\":\"myVal3\","+
-                    "\"myKey4\":\"myVal4\""+
-                "}"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 4 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 4);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueKey")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseKey")));
-        assertTrue("expected 3 arrayKey items", ((List)(JsonPath.read(doc, "$.arrayKey"))).size() == 3);
-        assertTrue("expected 0", Integer.valueOf(0).equals(jsonObject.query("/arrayKey/0")));
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonObject.query("/arrayKey/1")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/arrayKey/2")));
-        assertTrue("expected 4 objectKey items", ((Map)(JsonPath.read(doc, "$.objectKey"))).size() == 4);
-        assertTrue("expected myVal1", "myVal1".equals(jsonObject.query("/objectKey/myKey1")));
-        assertTrue("expected myVal2", "myVal2".equals(jsonObject.query("/objectKey/myKey2")));
-        assertTrue("expected myVal3", "myVal3".equals(jsonObject.query("/objectKey/myKey3")));
-        assertTrue("expected myVal4", "myVal4".equals(jsonObject.query("/objectKey/myKey4")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercise JSONObject toString() method with various indent levels.
-     */
-    @Test
-    public void jsonObjectToStringIndent() {
-        String jsonObject0Str =
-                "{"+
-                        "\"key1\":" +
-                                "[1,2," +
-                                        "{\"key3\":true}" +
-                                "],"+
-                        "\"key2\":" +
-                                "{\"key1\":\"val1\",\"key2\":" +
-                                        "{\"key2\":\"val2\"}" +
-                                "},"+
-                        "\"key3\":" +
-                                "[" +
-                                        "[1,2.1]" +
-                                "," +
-                                        "[null]" +
-                                "]"+
-                        "}";
-
-        String jsonObject1Str =
-                "{\n" +
-                " \"key1\": [\n" +
-                "  1,\n" +
-                "  2,\n" +
-                "  {\"key3\": true}\n" +
-                " ],\n" +
-                " \"key2\": {\n" +
-                "  \"key1\": \"val1\",\n" +
-                "  \"key2\": {\"key2\": \"val2\"}\n" +
-                " },\n" +
-                " \"key3\": [\n" +
-                "  [\n" +
-                "   1,\n" +
-                "   2.1\n" +
-                "  ],\n" +
-                "  [null]\n" +
-                " ]\n" +
-                "}";
-        String jsonObject4Str =
-                "{\n" +
-                "    \"key1\": [\n" +
-                "        1,\n" +
-                "        2,\n" +
-                "        {\"key3\": true}\n" +
-                "    ],\n" +
-                "    \"key2\": {\n" +
-                "        \"key1\": \"val1\",\n" +
-                "        \"key2\": {\"key2\": \"val2\"}\n" +
-                "    },\n" +
-                "    \"key3\": [\n" +
-                "        [\n" +
-                "            1,\n" +
-                "            2.1\n" +
-                "        ],\n" +
-                "        [null]\n" +
-                "    ]\n" +
-                "}";
-        JSONObject jsonObject = new JSONObject(jsonObject0Str);
-        // contents are tested in other methods, in this case just validate the spacing by
-        // checking length
-        assertEquals("toString() length",jsonObject0Str.length(), jsonObject.toString().length());
-        assertEquals("toString(0) length",jsonObject0Str.length(), jsonObject.toString(0).length());
-        assertEquals("toString(1) length",jsonObject1Str.length(), jsonObject.toString(1).length());
-        assertEquals("toString(4) length",jsonObject4Str.length(), jsonObject.toString(4).length());
-        
-        JSONObject jo = new JSONObject().put("TABLE", new JSONObject().put("yhoo", new JSONObject()));
-        assertEquals("toString(2)","{\"TABLE\": {\"yhoo\": {}}}", jo.toString(2));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject, jo
-        )));
-    }
-
-    /**
-     * Explores how JSONObject handles maps. Insert a string/string map
-     * as a value in a JSONObject. It will remain a map. Convert the 
-     * JSONObject to string, then create a new JSONObject from the string. 
-     * In the new JSONObject, the value will be stored as a nested JSONObject.
-     * Confirm that map and nested JSONObject have the same contents.
-     */
-    @Test
-    public void jsonObjectToStringSuppressWarningOnCastToMap() {
-        JSONObject jsonObject = new JSONObject();
-        Map map = new HashMap<>();
-        map.put("abc", "def");
-        jsonObject.put("key", map);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected 1 key item", ((Map)(JsonPath.read(doc, "$.key"))).size() == 1);
-        assertTrue("expected def", "def".equals(jsonObject.query("/key/abc")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Explores how JSONObject handles collections. Insert a string collection
-     * as a value in a JSONObject. It will remain a collection. Convert the 
-     * JSONObject to string, then create a new JSONObject from the string. 
-     * In the new JSONObject, the value will be stored as a nested JSONArray.
-     * Confirm that collection and nested JSONArray have the same contents.
-     */
-    @Test
-    public void jsonObjectToStringSuppressWarningOnCastToCollection() {
-        JSONObject jsonObject = new JSONObject();
-        Collection collection = new ArrayList();
-        collection.add("abc");
-        // ArrayList will be added as an object
-        jsonObject.put("key", collection);
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected 1 key item", ((List)(JsonPath.read(doc, "$.key"))).size() == 1);
-        assertTrue("expected abc", "abc".equals(jsonObject.query("/key/0")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercises the JSONObject.valueToString() method for various types
-     */
-    @Test
-    public void valueToString() {
-        
-        assertTrue("null valueToString() incorrect",
-                "null".equals(JSONObject.valueToString(null)));
-        MyJsonString jsonString = new MyJsonString();
-        assertTrue("jsonstring valueToString() incorrect",
-                "my string".equals(JSONObject.valueToString(jsonString)));
-        assertTrue("boolean valueToString() incorrect",
-                "true".equals(JSONObject.valueToString(Boolean.TRUE)));
-        assertTrue("non-numeric double",
-                "null".equals(JSONObject.doubleToString(Double.POSITIVE_INFINITY)));
-        String jsonObjectStr = 
-            "{"+
-                "\"key1\":\"val1\","+
-                "\"key2\":\"val2\","+
-                "\"key3\":\"val3\""+
-             "}";
-        JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        assertTrue("jsonObject valueToString() incorrect",
-            new JSONObject(JSONObject.valueToString(jsonObject))
-                .similar(new JSONObject(jsonObject.toString()))
-            );
-        String jsonArrayStr = 
-            "[1,2,3]";
-        JSONArray jsonArray = new JSONArray(jsonArrayStr);
-        assertTrue("jsonArray valueToString() incorrect",
-                JSONObject.valueToString(jsonArray).equals(jsonArray.toString()));
-        Map map = new HashMap();
-        map.put("key1", "val1");
-        map.put("key2", "val2");
-        map.put("key3", "val3");
-        assertTrue("map valueToString() incorrect",
-         new JSONObject(jsonObject.toString())
-         .similar(new JSONObject(JSONObject.valueToString(map))));
-        Collection collection = new ArrayList();
-        collection.add(Integer.valueOf(1));
-        collection.add(Integer.valueOf(2));
-        collection.add(Integer.valueOf(3));
-        assertTrue("collection valueToString() expected: "+
-                jsonArray.toString()+ " actual: "+
-                JSONObject.valueToString(collection),
-                jsonArray.toString().equals(JSONObject.valueToString(collection))); 
-        Integer[] array = { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3) };
-        assertTrue("array valueToString() incorrect",
-                jsonArray.toString().equals(JSONObject.valueToString(array)));
-        Util.checkJSONObjectMaps(jsonObject);
-        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
-    }
-
-    /**
-     * Confirm that https://github.com/douglascrockford/JSON-java/issues/167 is fixed.
-     * The following code was throwing a ClassCastException in the 
-     * JSONObject(Map) constructor
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void valueToStringConfirmException() {
-        Map myMap = new HashMap();
-        myMap.put(1,  "myValue");
-        // this is the test, it should not throw an exception
-        String str = JSONObject.valueToString(myMap);
-        // confirm result, just in case
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(str);
-        assertTrue("expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1);
-        assertTrue("expected myValue", "myValue".equals(JsonPath.read(doc, "$.1")));
-    }
-
-    /**
-     * Exercise the JSONObject wrap() method. Sometimes wrap() will change
-     * the object being wrapped, other times not. The purpose of wrap() is
-     * to ensure the value is packaged in a way that is compatible with how
-     * a JSONObject value or JSONArray value is supposed to be stored.
-     */
-    @Test
-    public void wrapObject() {
-        // wrap(null) returns NULL
-        assertTrue("null wrap() incorrect",
-                JSONObject.NULL == JSONObject.wrap(null));
-
-        // wrap(Integer) returns Integer
-        Integer in = Integer.valueOf(1);
-        assertTrue("Integer wrap() incorrect",
-                in == JSONObject.wrap(in));
-
-        /**
-         * This test is to document the preferred behavior if BigDecimal is
-         * supported. Previously bd returned as a string, since it
-         * is recognized as being a Java package class. Now with explicit
-         * support for big numbers, it remains a BigDecimal 
-         */
-        Object bdWrap = JSONObject.wrap(BigDecimal.ONE);
-        assertTrue("BigDecimal.ONE evaluates to ONE",
-                bdWrap.equals(BigDecimal.ONE));
-
-        // wrap JSONObject returns JSONObject
-        String jsonObjectStr = 
-                "{"+
-                    "\"key1\":\"val1\","+
-                    "\"key2\":\"val2\","+
-                    "\"key3\":\"val3\""+
-                 "}";
-        JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        assertTrue("JSONObject wrap() incorrect",
-                jsonObject == JSONObject.wrap(jsonObject));
-
-        // wrap collection returns JSONArray
-        Collection collection = new ArrayList();
-        collection.add(Integer.valueOf(1));
-        collection.add(Integer.valueOf(2));
-        collection.add(Integer.valueOf(3));
-        JSONArray jsonArray = (JSONArray) (JSONObject.wrap(collection));
-
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 3 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/1")));
-        assertTrue("expected 3", Integer.valueOf(3).equals(jsonArray.query("/2")));
-
-        // wrap Array returns JSONArray
-        Integer[] array = { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3) };
-        JSONArray integerArrayJsonArray = (JSONArray)(JSONObject.wrap(array));
-
-        // validate JSON
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 3 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/1")));
-        assertTrue("expected 3", Integer.valueOf(3).equals(jsonArray.query("/2")));
-
-        // validate JSON
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(integerArrayJsonArray.toString());
-        assertTrue("expected 3 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/1")));
-        assertTrue("expected 3", Integer.valueOf(3).equals(jsonArray.query("/2")));
-
-        // wrap map returns JSONObject
-        Map map = new HashMap();
-        map.put("key1", "val1");
-        map.put("key2", "val2");
-        map.put("key3", "val3");
-        JSONObject mapJsonObject = (JSONObject) (JSONObject.wrap(map));
-
-        // validate JSON
-        doc = Configuration.defaultConfiguration().jsonProvider().parse(mapJsonObject.toString());
-        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected val1", "val1".equals(mapJsonObject.query("/key1")));
-        assertTrue("expected val2", "val2".equals(mapJsonObject.query("/key2")));
-        assertTrue("expected val3", "val3".equals(mapJsonObject.query("/key3")));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObject, mapJsonObject
-        )));
-        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
-        Util.checkJSONArrayMaps(integerArrayJsonArray, jsonObject.getMapType());
-    }
-
-    
-    /**
-     * RFC 7159 defines control characters to be U+0000 through U+001F. This test verifies that the parser is checking for these in expected ways.
-     */
-    @Test
-    public void jsonObjectParseControlCharacters(){
-        for(int i = 0;i<=0x001f;i++){
-            final String charString = String.valueOf((char)i);
-            final String source = "{\"key\":\""+charString+"\"}";
-            try {
-                JSONObject jo = new JSONObject(source);
-                assertTrue("Expected "+charString+"("+i+") in the JSON Object but did not find it.",charString.equals(jo.getString("key")));
-                Util.checkJSONObjectMaps(jo);
-            } catch (JSONException ex) {
-                assertTrue("Only \\0 (U+0000), \\n (U+000A), and \\r (U+000D) should cause an error. Instead "+charString+"("+i+") caused an error",
-                        i=='\0' || i=='\n' || i=='\r'
-                );
-            }
-        }
-    }
-
-    @Test
-    public void jsonObjectParseControlCharacterEOFAssertExceptionMessage(){
-        char c = '\0';
-        final String source = "{\"key\":\"" + c + "\"}";
-        try {
-            JSONObject jo = new JSONObject(source);
-            fail("JSONException should be thrown");
-        } catch (JSONException ex) {
-            assertEquals("Unterminated string. " + "Character with int code 0" +
-                    " is not allowed within a quoted string. at 8 [character 9 line 1]", ex.getMessage());
-        }
-    }
-
-    @Test
-    public void jsonObjectParseControlCharacterNewLineAssertExceptionMessage(){
-        char[] chars = {'\n', '\r'};
-        for( char c : chars) {
-            final String source = "{\"key\":\"" + c + "\"}";
-            try {
-                JSONObject jo = new JSONObject(source);
-                fail("JSONException should be thrown");
-            } catch (JSONException ex) {
-                assertEquals("Unterminated string. " + "Character with int code " + (int) c +
-                        " is not allowed within a quoted string. at 9 [character 0 line 2]", ex.getMessage());
-            }
-        }
-    }
-
-    @Test
-    public void jsonObjectParseUTF8EncodingAssertExceptionMessage(){
-        String c = "\\u123x";
-        final String source = "{\"key\":\"" + c + "\"}";
-        try {
-            JSONObject jo = new JSONObject(source);
-            fail("JSONException should be thrown");
-        } catch (JSONException ex) {
-            assertEquals("Illegal escape. \\u must be followed by a 4 digit hexadecimal number. " +
-                    "\\123x is not valid. at 14 [character 15 line 1]", ex.getMessage());
-        }
-    }
-
-    @Test
-    public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){
-        String c = "\\x";
-        final String source = "{\"key\":\"" + c + "\"}";
-        try {
-            JSONObject jo = new JSONObject(source);
-            fail("JSONException should be thrown");
-        } catch (JSONException ex) {
-            assertEquals("Illegal escape. Escape sequence  " + c + " is not valid." +
-                    " at 10 [character 11 line 1]", ex.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorTrailingCurlyBrace () {
-        try {
-            // does not end with '}'
-            String str = "{";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "A JSONObject text must end with '}' at 1 [character 2 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorInitialCurlyBrace() {
-        try {
-            // does not start with '{'
-            String str = "abc";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "A JSONObject text must begin with '{' at 1 [character 2 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorNoColon() {
-        try {
-            // key with no ':'
-            String str = "{\"myKey\" = true}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Expected a ':' after a key at 10 [character 11 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorNoCommaSeparator() {
-        try {
-            // entries with no ',' separator
-            String str = "{\"myKey\":true \"myOtherKey\":false}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Expected a ',' or '}' at 15 [character 16 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorKeyIsNestedMap() {
-        try {
-            // key is a nested map
-            String str = "{{\"foo\": \"bar\"}: \"baz\"}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Missing value at 1 [character 2 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorKeyIsNestedArrayWithMap() {
-        try {
-            // key is a nested array containing a map
-            String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Missing value at 9 [character 10 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorKeyContainsCurlyBrace() {
-        try {
-            // key contains }
-            String str = "{foo}: 2}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-//            assertEquals("Expecting an exception message",
-//                    "Expected a ':' after a key at 5 [character 6 line 1]",
-//                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorKeyContainsSquareBrace() {
-        try {
-            // key contains ]
-            String str = "{foo]: 2}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-//            assertEquals("Expecting an exception message",
-//                    "Expected a ':' after a key at 5 [character 6 line 1]",
-//                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorKeyContainsBinaryZero() {
-        try {
-            // \0 after ,
-            String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
-            assertNull("Expected an exception", new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "A JSONObject text must end with '}' at 15 [character 16 line 1]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorAppendToWrongValue() {
-        try {
-            // append to wrong value
-            String str = "{\"myKey\":true, \"myOtherKey\":false}";
-            JSONObject jsonObject = new JSONObject(str);
-            jsonObject.append("myKey", "hello");
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"myKey\"] is not a JSONArray (null).",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorIncrementWrongValue() {
-        try {
-            // increment wrong value
-            String str = "{\"myKey\":true, \"myOtherKey\":false}";
-            JSONObject jsonObject = new JSONObject(str);
-            jsonObject.increment("myKey");
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Unable to increment [\"myKey\"].",
-                    e.getMessage());
-        }
-    }
-    @Test
-    public void parsingErrorInvalidKey() {
-        try {
-            // invalid key
-            String str = "{\"myKey\":true, \"myOtherKey\":false}";
-            JSONObject jsonObject = new JSONObject(str);
-            jsonObject.get(null);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Null key.",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorNumberToString() {
-        try {
-            // invalid numberToString()
-            JSONObject.numberToString((Number) null);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Null pointer",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorPutOnceDuplicateKey() {
-        try {
-            // multiple putOnce key
-            JSONObject jsonObject = new JSONObject("{}");
-            jsonObject.putOnce("hello", "world");
-            jsonObject.putOnce("hello", "world!");
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertTrue("", true);
-        }
-    }
-
-    @Test
-    public void parsingErrorInvalidDouble() {
-        try {
-            // test validity of invalid double
-            JSONObject.testValidity(Double.NaN);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertTrue("", true);
-        }
-    }
-
-    @Test
-    public void parsingErrorInvalidFloat() {
-        try {
-            // test validity of invalid float
-            JSONObject.testValidity(Float.NEGATIVE_INFINITY);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertTrue("", true);
-        }
-    }
-
-    @Test
-    public void parsingErrorDuplicateKeyException() {
-        try {
-            // test exception message when including a duplicate key (level 0)
-            String str = "{\n"
-                    + "    \"attr01\":\"value-01\",\n"
-                    + "    \"attr02\":\"value-02\",\n"
-                    + "    \"attr03\":\"value-03\",\n"
-                    + "    \"attr03\":\"value-04\"\n"
-                    + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorNestedDuplicateKeyException() {
-        try {
-            // test exception message when including a duplicate key (level 0) holding an object
-            String str = "{\n"
-                    + "    \"attr01\":\"value-01\",\n"
-                    + "    \"attr02\":\"value-02\",\n"
-                    + "    \"attr03\":\"value-03\",\n"
-                    + "    \"attr03\": {"
-                    + "        \"attr04-01\":\"value-04-01\",n"
-                    + "        \"attr04-02\":\"value-04-02\",n"
-                    + "        \"attr04-03\":\"value-04-03\"n"
-                    + "    }\n"
-                    + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorNestedDuplicateKeyWithArrayException() {
-        try {
-            // test exception message when including a duplicate key (level 0) holding an array
-            String str = "{\n"
-                    + "    \"attr01\":\"value-01\",\n"
-                    + "    \"attr02\":\"value-02\",\n"
-                    + "    \"attr03\":\"value-03\",\n"
-                    + "    \"attr03\": [\n"
-                    + "        {"
-                    + "            \"attr04-01\":\"value-04-01\",n"
-                    + "            \"attr04-02\":\"value-04-02\",n"
-                    + "            \"attr04-03\":\"value-04-03\"n"
-                    + "        }\n"
-                    + "    ]\n"
-                    + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorDuplicateKeyWithinNestedDictExceptionMessage() {
-        try {
-            // test exception message when including a duplicate key (level 1)
-            String str = "{\n"
-                    + "    \"attr01\":\"value-01\",\n"
-                    + "    \"attr02\":\"value-02\",\n"
-                    + "    \"attr03\":\"value-03\",\n"
-                    + "    \"attr04\": {\n"
-                    + "        \"attr04-01\":\"value04-01\",\n"
-                    + "        \"attr04-02\":\"value04-02\",\n"
-                    + "        \"attr04-03\":\"value04-03\",\n"
-                    + "        \"attr04-03\":\"value04-04\"\n"
-                    + "    }\n"
-                    + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorDuplicateKeyDoubleNestedDictExceptionMessage() {
-        try {
-            // test exception message when including a duplicate key (level 1) holding an
-            // object
-            String str = "{\n"
-                    + "    \"attr01\":\"value-01\",\n"
-                    + "    \"attr02\":\"value-02\",\n"
-                    + "    \"attr03\":\"value-03\",\n"
-                    + "    \"attr04\": {\n"
-                    + "        \"attr04-01\":\"value04-01\",\n"
-                    + "        \"attr04-02\":\"value04-02\",\n"
-                    + "        \"attr04-03\":\"value04-03\",\n"
-                    + "        \"attr04-03\": {\n"
-                    + "            \"attr04-04-01\":\"value04-04-01\",\n"
-                    + "            \"attr04-04-02\":\"value04-04-02\",\n"
-                    + "            \"attr04-04-03\":\"value04-04-03\",\n"
-                    + "        }\n"
-                    + "    }\n"
-                    + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorDuplicateKeyNestedWithArrayExceptionMessage() {
-        try {
-            // test exception message when including a duplicate key (level 1) holding an
-            // array
-            String str = "{\n"
-                    + "    \"attr01\":\"value-01\",\n"
-                    + "    \"attr02\":\"value-02\",\n"
-                    + "    \"attr03\":\"value-03\",\n"
-                    + "    \"attr04\": {\n"
-                    + "        \"attr04-01\":\"value04-01\",\n"
-                    + "        \"attr04-02\":\"value04-02\",\n"
-                    + "        \"attr04-03\":\"value04-03\",\n"
-                    + "        \"attr04-03\": [\n"
-                    + "            {\n"
-                    + "                \"attr04-04-01\":\"value04-04-01\",\n"
-                    + "                \"attr04-04-02\":\"value04-04-02\",\n"
-                    + "                \"attr04-04-03\":\"value04-04-03\",\n"
-                    + "            }\n"
-                    + "        ]\n"
-                    + "    }\n"
-                    + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorDuplicateKeyWithinArrayExceptionMessage() {
-        try {
-            // test exception message when including a duplicate key in object (level 0)
-            // within an array
-            String str = "[\n"
-                    + "    {\n"
-                    + "        \"attr01\":\"value-01\",\n"
-                    + "        \"attr02\":\"value-02\"\n"
-                    + "    },\n"
-                    + "    {\n"
-                    + "        \"attr01\":\"value-01\",\n"
-                    + "        \"attr01\":\"value-02\"\n"
-                    + "    }\n"
-                    + "]";
-            new JSONArray(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr01\" at 124 [character 17 line 8]",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    public void parsingErrorDuplicateKeyDoubleNestedWithinArrayExceptionMessage() {
-        try {
-            // test exception message when including a duplicate key in object (level 1)
-            // within an array
-            String str = "[\n"
-                    + "    {\n"
-                    + "        \"attr01\":\"value-01\",\n"
-                    + "        \"attr02\": {\n"
-                    + "            \"attr02-01\":\"value-02-01\",\n"
-                    + "            \"attr02-02\":\"value-02-02\"\n"
-                    + "        }\n"
-                    + "    },\n"
-                    + "    {\n"
-                    + "        \"attr01\":\"value-01\",\n"
-                    + "        \"attr02\": {\n"
-                    + "            \"attr02-01\":\"value-02-01\",\n"
-                    + "            \"attr02-01\":\"value-02-02\"\n"
-                    + "        }\n"
-                    + "    }\n"
-                    + "]";
-            new JSONArray(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr02-01\" at 269 [character 24 line 13]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Confirm behavior when putOnce() is called with null parameters
-     */
-    @Test
-    public void jsonObjectPutOnceNull() {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.putOnce(null, null);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-        jsonObject.putOnce("", null);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-        jsonObject.putOnce(null, "");
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-     * Exercise JSONObject opt(key, default) method.
-     */
-    @Test
-    public void jsonObjectOptDefault() {
-
-        String str = "{\"myKey\": \"myval\", \"hiKey\": null}";
-        JSONObject jsonObject = new JSONObject(str);
-
-        assertTrue("optBigDecimal() should return default BigDecimal",
-                BigDecimal.TEN.compareTo(jsonObject.optBigDecimal("myKey", BigDecimal.TEN))==0);
-        assertTrue("optBigInteger() should return default BigInteger",
-                BigInteger.TEN.compareTo(jsonObject.optBigInteger("myKey",BigInteger.TEN ))==0);
-        assertTrue("optBoolean() should return default boolean",
-                 jsonObject.optBoolean("myKey", true));
-        assertTrue("optBooleanObject() should return default Boolean",
-                 jsonObject.optBooleanObject("myKey", true));
-        assertTrue("optInt() should return default int",
-                42 == jsonObject.optInt("myKey", 42));
-        assertTrue("optIntegerObject() should return default Integer",
-                Integer.valueOf(42).equals(jsonObject.optIntegerObject("myKey", 42)));
-        assertTrue("optEnum() should return default Enum",
-                MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
-        assertTrue("optJSONArray() should return null ",
-                null==jsonObject.optJSONArray("myKey"));
-        assertTrue("optJSONArray() should return default JSONArray",
-                "value".equals(jsonObject.optJSONArray("myKey", new JSONArray("[\"value\"]")).getString(0)));
-        assertTrue("optJSONObject() should return default JSONObject ",
-                jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
-        assertTrue("optLong() should return default long",
-                42l == jsonObject.optLong("myKey", 42l));
-        assertTrue("optLongObject() should return default Long",
-                Long.valueOf(42l).equals(jsonObject.optLongObject("myKey", 42l)));
-        assertTrue("optDouble() should return default double",
-                42.3d == jsonObject.optDouble("myKey", 42.3d));
-        assertTrue("optDoubleObject() should return default Double",
-                Double.valueOf(42.3d).equals(jsonObject.optDoubleObject("myKey", 42.3d)));
-        assertTrue("optFloat() should return default float",
-                42.3f == jsonObject.optFloat("myKey", 42.3f));
-        assertTrue("optFloatObject() should return default Float",
-                Float.valueOf(42.3f).equals(jsonObject.optFloatObject("myKey", 42.3f)));
-        assertTrue("optNumber() should return default Number",
-                42l == jsonObject.optNumber("myKey", Long.valueOf(42)).longValue());
-        assertTrue("optString() should return default string",
-                "hi".equals(jsonObject.optString("hiKey", "hi")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-    
-    /**
-     * Exercise JSONObject opt(key, default) method when the key doesn't exist.
-     */
-    @Test
-    public void jsonObjectOptNoKey() {
-
-         JSONObject jsonObject = new JSONObject();
-         
-         assertNull(jsonObject.opt(null));
-
-         assertTrue("optBigDecimal() should return default BigDecimal",
-                 BigDecimal.TEN.compareTo(jsonObject.optBigDecimal("myKey", BigDecimal.TEN))==0);
-         assertTrue("optBigInteger() should return default BigInteger",
-                 BigInteger.TEN.compareTo(jsonObject.optBigInteger("myKey",BigInteger.TEN ))==0);
-         assertTrue("optBoolean() should return default boolean",
-                  jsonObject.optBoolean("myKey", true));
-         assertTrue("optBooleanObject() should return default Boolean",
-                  jsonObject.optBooleanObject("myKey", true));
-         assertTrue("optInt() should return default int",
-                 42 == jsonObject.optInt("myKey", 42));
-         assertTrue("optIntegerObject() should return default Integer",
-                 Integer.valueOf(42).equals(jsonObject.optIntegerObject("myKey", 42)));
-         assertTrue("optEnum() should return default Enum",
-                 MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
-         assertTrue("optJSONArray() should return default JSONArray",
-                 "value".equals(jsonObject.optJSONArray("myKey", new JSONArray("[\"value\"]")).getString(0)));
-         assertTrue("optJSONArray() should return null ",
-                 null==jsonObject.optJSONArray("myKey"));
-         assertTrue("optJSONObject() should return default JSONObject ",
-                jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
-         assertTrue("optLong() should return default long",
-                 42l == jsonObject.optLong("myKey", 42l));
-         assertTrue("optLongObject() should return default Long",
-                 Long.valueOf(42l).equals(jsonObject.optLongObject("myKey", 42l)));
-         assertTrue("optDouble() should return default double",
-                 42.3d == jsonObject.optDouble("myKey", 42.3d));
-         assertTrue("optDoubleObject() should return default Double",
-                 Double.valueOf(42.3d).equals(jsonObject.optDoubleObject("myKey", 42.3d)));
-         assertTrue("optFloat() should return default float",
-                 42.3f == jsonObject.optFloat("myKey", 42.3f));
-         assertTrue("optFloatObject() should return default Float",
-                 Float.valueOf(42.3f).equals(jsonObject.optFloatObject("myKey", 42.3f)));
-         assertTrue("optNumber() should return default Number",
-                 42l == jsonObject.optNumber("myKey", Long.valueOf(42)).longValue());
-         assertTrue("optString() should return default string",
-                 "hi".equals(jsonObject.optString("hiKey", "hi")));
-         Util.checkJSONObjectMaps(jsonObject);
-    }
-    
-    /**
-     * Verifies that the opt methods properly convert string values.
-     */
-    @Test
-    public void jsonObjectOptStringConversion() {
-        JSONObject jo = new JSONObject("{\"int\":\"123\",\"true\":\"true\",\"false\":\"false\"}");
-        assertTrue("unexpected optBoolean value",jo.optBoolean("true",false)==true);
-        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(true).equals(jo.optBooleanObject("true",false)));
-        assertTrue("unexpected optBoolean value",jo.optBoolean("false",true)==false);
-        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(false).equals(jo.optBooleanObject("false",true)));
-        assertTrue("unexpected optInt value",jo.optInt("int",0)==123);
-        assertTrue("unexpected optIntegerObject value",Integer.valueOf(123).equals(jo.optIntegerObject("int",0)));
-        assertTrue("unexpected optLong value",jo.optLong("int",0)==123l);
-        assertTrue("unexpected optLongObject value",Long.valueOf(123l).equals(jo.optLongObject("int",0L)));
-        assertTrue("unexpected optDouble value",jo.optDouble("int",0.0d)==123.0d);
-        assertTrue("unexpected optDoubleObject value",Double.valueOf(123.0d).equals(jo.optDoubleObject("int",0.0d)));
-        assertTrue("unexpected optFloat value",jo.optFloat("int",0.0f)==123.0f);
-        assertTrue("unexpected optFloatObject value",Float.valueOf(123.0f).equals(jo.optFloatObject("int",0.0f)));
-        assertTrue("unexpected optBigInteger value",jo.optBigInteger("int",BigInteger.ZERO).compareTo(new BigInteger("123"))==0);
-        assertTrue("unexpected optBigDecimal value",jo.optBigDecimal("int",BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
-        assertTrue("unexpected optBigDecimal value",jo.optBigDecimal("int",BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
-        assertTrue("unexpected optNumber value",jo.optNumber("int",BigInteger.ZERO).longValue()==123l);
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    /**
-     * Verifies that the opt methods properly convert string values to numbers and coerce them consistently.
-     */
-    @Test
-    public void jsonObjectOptCoercion() {
-        JSONObject jo = new JSONObject("{\"largeNumberStr\":\"19007199254740993.35481234487103587486413587843213584\"}");
-        // currently the parser doesn't recognize BigDecimal, to we have to put it manually
-        jo.put("largeNumber", new BigDecimal("19007199254740993.35481234487103587486413587843213584"));
-        
-        // Test type coercion from larger to smaller
-        assertEquals(new BigDecimal("19007199254740993.35481234487103587486413587843213584"), jo.optBigDecimal("largeNumber",null));
-        assertEquals(new BigInteger("19007199254740993"), jo.optBigInteger("largeNumber",null));
-        assertEquals(1.9007199254740992E16, jo.optDouble("largeNumber"),0.0);
-        assertEquals(1.9007199254740992E16, jo.optDoubleObject("largeNumber"),0.0);
-        assertEquals(1.90071995E16f, jo.optFloat("largeNumber"),0.0f);
-        assertEquals(1.90071995E16f, jo.optFloatObject("largeNumber"),0.0f);
-        assertEquals(19007199254740993l, jo.optLong("largeNumber"));
-        assertEquals(Long.valueOf(19007199254740993l), jo.optLongObject("largeNumber"));
-        assertEquals(1874919425, jo.optInt("largeNumber"));
-        assertEquals(Integer.valueOf(1874919425), jo.optIntegerObject("largeNumber"));
-
-        // conversion from a string
-        assertEquals(new BigDecimal("19007199254740993.35481234487103587486413587843213584"), jo.optBigDecimal("largeNumberStr",null));
-        assertEquals(new BigInteger("19007199254740993"), jo.optBigInteger("largeNumberStr",null));
-        assertEquals(1.9007199254740992E16, jo.optDouble("largeNumberStr"),0.0);
-        assertEquals(1.9007199254740992E16, jo.optDoubleObject("largeNumberStr"),0.0);
-        assertEquals(1.90071995E16f, jo.optFloat("largeNumberStr"),0.0f);
-        assertEquals(1.90071995E16f, jo.optFloatObject("largeNumberStr"),0.0f);
-        assertEquals(19007199254740993l, jo.optLong("largeNumberStr"));
-        assertEquals(Long.valueOf(19007199254740993l), jo.optLongObject("largeNumberStr"));
-        assertEquals(1874919425, jo.optInt("largeNumberStr"));
-        assertEquals(Integer.valueOf(1874919425), jo.optIntegerObject("largeNumberStr"));
-
-        // the integer portion of the actual value is larger than a double can hold.
-        assertNotEquals((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optLong("largeNumber"));
-        assertNotEquals(Long.valueOf((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optLongObject("largeNumber"));
-        assertNotEquals((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optInt("largeNumber"));
-        assertNotEquals(Integer.valueOf((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optIntegerObject("largeNumber"));
-        assertNotEquals((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optLong("largeNumberStr"));
-        assertNotEquals(Long.valueOf((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optLongObject("largeNumberStr"));
-        assertNotEquals((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optInt("largeNumberStr"));
-        assertNotEquals(Integer.valueOf((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optIntegerObject("largeNumberStr"));
-        assertEquals(19007199254740992l, (long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"));
-        assertEquals(2147483647, (int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"));
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    /**
-     * Verifies that the optBigDecimal method properly converts values to BigDecimal and coerce them consistently.
-     */
-    @Test
-    public void jsonObjectOptBigDecimal() {
-        JSONObject jo = new JSONObject().put("int", 123).put("long", 654L)
-                .put("float", 1.234f).put("double", 2.345d)
-                .put("bigInteger", new BigInteger("1234"))
-                .put("bigDecimal", new BigDecimal("1234.56789"))
-                .put("nullVal", JSONObject.NULL);
-        
-        assertEquals(new BigDecimal("123"),jo.optBigDecimal("int", null));
-        assertEquals(new BigDecimal("654"),jo.optBigDecimal("long", null));
-        assertEquals(new BigDecimal(1.234f),jo.optBigDecimal("float", null));
-        assertEquals(new BigDecimal(2.345d),jo.optBigDecimal("double", null));
-        assertEquals(new BigDecimal("1234"),jo.optBigDecimal("bigInteger", null));
-        assertEquals(new BigDecimal("1234.56789"),jo.optBigDecimal("bigDecimal", null));
-        assertNull(jo.optBigDecimal("nullVal", null));
-        assertEquals(jo.optBigDecimal("float", null),jo.getBigDecimal("float"));
-        assertEquals(jo.optBigDecimal("double", null),jo.getBigDecimal("double"));
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    /**
-     * Verifies that the optBigDecimal method properly converts values to BigDecimal and coerce them consistently.
-     */
-    @Test
-    public void jsonObjectOptBigInteger() {
-        JSONObject jo = new JSONObject().put("int", 123).put("long", 654L)
-                .put("float", 1.234f).put("double", 2.345d)
-                .put("bigInteger", new BigInteger("1234"))
-                .put("bigDecimal", new BigDecimal("1234.56789"))
-                .put("nullVal", JSONObject.NULL);
-        
-        assertEquals(new BigInteger("123"),jo.optBigInteger("int", null));
-        assertEquals(new BigInteger("654"),jo.optBigInteger("long", null));
-        assertEquals(new BigInteger("1"),jo.optBigInteger("float", null));
-        assertEquals(new BigInteger("2"),jo.optBigInteger("double", null));
-        assertEquals(new BigInteger("1234"),jo.optBigInteger("bigInteger", null));
-        assertEquals(new BigInteger("1234"),jo.optBigInteger("bigDecimal", null));
-        assertNull(jo.optBigDecimal("nullVal", null));
-        Util.checkJSONObjectMaps(jo);
-    }
-
-    /**
-     * Confirm behavior when JSONObject put(key, null object) is called
-     */
-    @Test
-    public void jsonObjectputNull() {
-
-        // put null should remove the item.
-        String str = "{\"myKey\": \"myval\"}";
-        JSONObject jsonObjectRemove = new JSONObject(str);
-        jsonObjectRemove.remove("myKey");
-        assertTrue("jsonObject should be empty", jsonObjectRemove.isEmpty());
-
-        JSONObject jsonObjectPutNull = new JSONObject(str);
-        jsonObjectPutNull.put("myKey", (Object) null);
-        assertTrue("jsonObject should be empty", jsonObjectPutNull.isEmpty());
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObjectRemove, jsonObjectPutNull
-        )));
-    }
-
-    /**
-     * Exercise JSONObject quote() method
-     * This purpose of quote() is to ensure that for strings with embedded
-     * quotes, the quotes are properly escaped.
-     */
-    @Test
-    public void jsonObjectQuote() {
-        String str;
-        str = "";
-        String quotedStr;
-        quotedStr = JSONObject.quote(str);
-        assertTrue("quote() expected escaped quotes, found "+quotedStr,
-                "\"\"".equals(quotedStr));
-        str = "\"\"";
-        quotedStr = JSONObject.quote(str);
-        assertTrue("quote() expected escaped quotes, found "+quotedStr,
-                "\"\\\"\\\"\"".equals(quotedStr));
-        str = "null and null will be emitted as ""
-         */
-        String sJONull = XML.toString(jsonObjectJONull);
-        assertTrue("JSONObject.NULL should emit a null value", 
-                "null".equals(sJONull));
-        String sNull = XML.toString(jsonObjectNull);
-        assertTrue("null should emit an empty string", "".equals(sNull));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jsonObjectJONull, jsonObjectNull
-        )));
-    }
-    
-    @Test(expected = JSONPointerException.class)
-    public void queryWithNoResult() {
-        new JSONObject().query("/a/b");
-    }
-    
-    @Test
-    public void optQueryWithNoResult() {
-        assertNull(new JSONObject().optQuery("/a/b"));
-    }
-    
-    @Test(expected = IllegalArgumentException.class)
-    public void optQueryWithSyntaxError() {
-        new JSONObject().optQuery("invalid");
-    }
-
-    @Test(expected = JSONException.class)
-    public void invalidEscapeSequence() {
-      String json = "{ \"\\url\": \"value\" }";
-      assertNull("Expected an exception",new JSONObject(json));
-    }
-
-    /**
-     * Exercise JSONObject toMap() method.
-     */
-    @Test
-    public void toMap() {
-        String jsonObjectStr =
-                "{" +
-                "\"key1\":" +
-                    "[1,2," +
-                        "{\"key3\":true}" +
-                    "]," +
-                "\"key2\":" +
-                    "{\"key1\":\"val1\",\"key2\":" +
-                        "{\"key2\":null}," +
-                    "\"key3\":42" +
-                    "}," +
-                "\"key3\":" +
-                    "[" +
-                        "[\"value1\",2.1]" +
-                    "," +
-                        "[null]" +
-                    "]" +
-                "}";
-
-        JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        Map map = jsonObject.toMap();
-
-        assertTrue("Map should not be null", map != null);
-        assertTrue("Map should have 3 elements", map.size() == 3);
-
-        List key1List = (List)map.get("key1");
-        assertTrue("key1 should not be null", key1List != null);
-        assertTrue("key1 list should have 3 elements", key1List.size() == 3);
-        assertTrue("key1 value 1 should be 1", key1List.get(0).equals(Integer.valueOf(1)));
-        assertTrue("key1 value 2 should be 2", key1List.get(1).equals(Integer.valueOf(2)));
-
-        Map key1Value3Map = (Map)key1List.get(2);
-        assertTrue("Map should not be null", key1Value3Map != null);
-        assertTrue("Map should have 1 element", key1Value3Map.size() == 1);
-        assertTrue("Map key3 should be true", key1Value3Map.get("key3").equals(Boolean.TRUE));
-
-        Map key2Map = (Map)map.get("key2");
-        assertTrue("key2 should not be null", key2Map != null);
-        assertTrue("key2 map should have 3 elements", key2Map.size() == 3);
-        assertTrue("key2 map key 1 should be val1", key2Map.get("key1").equals("val1"));
-        assertTrue("key2 map key 3 should be 42", key2Map.get("key3").equals(Integer.valueOf(42)));
-
-        Map key2Val2Map = (Map)key2Map.get("key2");
-        assertTrue("key2 map key 2 should not be null", key2Val2Map != null);
-        assertTrue("key2 map key 2 should have an entry", key2Val2Map.containsKey("key2"));
-        assertTrue("key2 map key 2 value should be null", key2Val2Map.get("key2") == null);
-
-        List key3List = (List)map.get("key3");
-        assertTrue("key3 should not be null", key3List != null);
-        assertTrue("key3 list should have 3 elements", key3List.size() == 2);
-
-        List key3Val1List = (List)key3List.get(0);
-        assertTrue("key3 list val 1 should not be null", key3Val1List != null);
-        assertTrue("key3 list val 1 should have 2 elements", key3Val1List.size() == 2);
-        assertTrue("key3 list val 1 list element 1 should be value1", key3Val1List.get(0).equals("value1"));
-        assertTrue("key3 list val 1 list element 2 should be 2.1", key3Val1List.get(1).equals(new BigDecimal("2.1")));
-
-        List key3Val2List = (List)key3List.get(1);
-        assertTrue("key3 list val 2 should not be null", key3Val2List != null);
-        assertTrue("key3 list val 2 should have 1 element", key3Val2List.size() == 1);
-        assertTrue("key3 list val 2 list element 1 should be null", key3Val2List.get(0) == null);
-
-        // Assert that toMap() is a deep copy
-        jsonObject.getJSONArray("key3").getJSONArray(0).put(0, "still value 1");
-        assertTrue("key3 list val 1 list element 1 should be value1", key3Val1List.get(0).equals("value1"));
-
-        // assert that the new map is mutable
-        assertTrue("Removing a key should succeed", map.remove("key3") != null);
-        assertTrue("Map should have 2 elements", map.size() == 2);
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-    
-    /**
-     * test that validates a singleton can be serialized as a bean.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void testSingletonBean() {
-        final JSONObject jo = new JSONObject(Singleton.getInstance());
-        assertEquals(jo.keySet().toString(), 1, jo.length());
-        assertEquals(0, jo.get("someInt"));
-        assertEquals(null, jo.opt("someString"));
-        
-        // Update the singleton values
-        Singleton.getInstance().setSomeInt(42);
-        Singleton.getInstance().setSomeString("Something");
-        final JSONObject jo2 = new JSONObject(Singleton.getInstance());
-        assertEquals(2, jo2.length());
-        assertEquals(42, jo2.get("someInt"));
-        assertEquals("Something", jo2.get("someString"));
-
-        // ensure our original jo hasn't changed.
-        assertEquals(0, jo.get("someInt"));
-        assertEquals(null, jo.opt("someString"));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jo, jo2
-        )));
-    }
-
-    /**
-     * test that validates a singleton can be serialized as a bean.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void testSingletonEnumBean() {
-        final JSONObject jo = new JSONObject(SingletonEnum.getInstance());
-        assertEquals(jo.keySet().toString(), 1, jo.length());
-        assertEquals(0, jo.get("someInt"));
-        assertEquals(null, jo.opt("someString"));
-        
-        // Update the singleton values
-        SingletonEnum.getInstance().setSomeInt(42);
-        SingletonEnum.getInstance().setSomeString("Something");
-        final JSONObject jo2 = new JSONObject(SingletonEnum.getInstance());
-        assertEquals(2, jo2.length());
-        assertEquals(42, jo2.get("someInt"));
-        assertEquals("Something", jo2.get("someString"));
-
-        // ensure our original jo hasn't changed.
-        assertEquals(0, jo.get("someInt"));
-        assertEquals(null, jo.opt("someString"));
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                jo, jo2
-        )));
-    }
-    
-    /**
-     * Test to validate that a generic class can be serialized as a bean.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void testGenericBean() {
-        GenericBean bean = new GenericBean<>(42);
-        final JSONObject jo = new JSONObject(bean);
-        assertEquals(jo.keySet().toString(), 8, jo.length());
-        assertEquals(42, jo.get("genericValue"));
-        assertEquals("Expected the getter to only be called once",
-                1, bean.genericGetCounter);
-        assertEquals(0, bean.genericSetCounter);
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    /**
-     * Test to validate that a generic class can be serialized as a bean.
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void testGenericIntBean() {
-        GenericBeanInt bean = new GenericBeanInt(42);
-        final JSONObject jo = new JSONObject(bean);
-        assertEquals(jo.keySet().toString(), 10, jo.length());
-        assertEquals(42, jo.get("genericValue"));
-        assertEquals("Expected the getter to only be called once",
-                1, bean.genericGetCounter);
-        assertEquals(0, bean.genericSetCounter);
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    /**
-     * Test to verify key limitations in the JSONObject bean serializer.
-     */
-    @Test
-    public void testWierdListBean() {
-        @SuppressWarnings("boxing")
-        WeirdList bean = new WeirdList(42, 43, 44);
-        final JSONObject jo = new JSONObject(bean);
-        // get() should have a key of 0 length
-        // get(int) should be ignored base on parameter count
-        // getInt(int) should also be ignored based on parameter count
-        // add(Integer) should be ignore as it doesn't start with get/is and also has a parameter
-        // getALL should be mapped
-        assertEquals("Expected 1 key to be mapped. Instead found: "+jo.keySet().toString(),
-                1, jo.length());
-        assertNotNull(jo.get("ALL"));
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    /**
-     * Sample test case from https://github.com/stleary/JSON-java/issues/531
-     * which verifies that no regression in double/BigDecimal support is present.
-     */
-    @Test
-    public void testObjectToBigDecimal() {  
-        double value = 1412078745.01074;  
-        Reader reader = new StringReader("[{\"value\": " + value + "}]");
-        JSONTokener tokener = new JSONTokener(reader);
-        JSONArray array = new JSONArray(tokener);
-        JSONObject jsonObject = array.getJSONObject(0);
-
-        BigDecimal current = jsonObject.getBigDecimal("value");
-        BigDecimal wantedValue = BigDecimal.valueOf(value);
-
-        assertEquals(current, wantedValue);
-        Util.checkJSONObjectMaps(jsonObject);
-        Util.checkJSONArrayMaps(array, jsonObject.getMapType());
-     }
-    
-    /**
-     * Tests the exception portions of populateMap.
-     */
-    @Test
-    public void testExceptionalBean() {
-        ExceptionalBean bean = new ExceptionalBean();
-        final JSONObject jo = new JSONObject(bean);
-        assertEquals("Expected 1 key to be mapped. Instead found: "+jo.keySet().toString(),
-                1, jo.length());
-        assertTrue(jo.get("closeable") instanceof JSONObject);
-        assertTrue(jo.getJSONObject("closeable").has("string"));
-        Util.checkJSONObjectMaps(jo);
-    }
-    
-    @Test(expected=NullPointerException.class)
-    public void testPutNullBoolean() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, false);
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullCollection() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, Collections.emptySet());
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullDouble() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, 0.0d);
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullFloat() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, 0.0f);
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullInt() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, 0);
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullLong() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, 0L);
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullMap() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, Collections.emptyMap());
-        fail("Expected an exception");
-    }
-    @Test(expected=NullPointerException.class)
-    public void testPutNullObject() {
-        // null put key 
-        JSONObject jsonObject = new JSONObject("{}");
-        jsonObject.put(null, new Object());
-        fail("Expected an exception");
-    }
-    @Test(expected=JSONException.class)
-    public void testSelfRecursiveObject() {
-        // A -> A ...
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        ObjA.setRef(ObjA);
-        new JSONObject(ObjA);
-        fail("Expected an exception");
-    }
-    @Test(expected=JSONException.class)
-    public void testLongSelfRecursiveObject() {
-        // B -> A -> A ...
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB");
-        ObjB.setRef(ObjA);
-        ObjA.setRef(ObjA);
-        new JSONObject(ObjB);
-        fail("Expected an exception");
-    }
-    @Test(expected=JSONException.class)
-    public void testSimpleRecursiveObject() {
-        // B -> A -> B ...
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB");
-        ObjB.setRef(ObjA);
-        ObjA.setRef(ObjB);
-        new JSONObject(ObjA);
-        fail("Expected an exception");
-    }
-    @Test(expected=JSONException.class)
-    public void testLongRecursiveObject() {
-        // D -> C -> B -> A -> D ...
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB");
-        RecursiveBean ObjC = new RecursiveBean("ObjC");
-        RecursiveBean ObjD = new RecursiveBean("ObjD");
-        ObjC.setRef(ObjB);
-        ObjB.setRef(ObjA);
-        ObjD.setRef(ObjC);
-        ObjA.setRef(ObjD);
-        new JSONObject(ObjB);
-        fail("Expected an exception");
-    }
-    @Test(expected=JSONException.class)
-    public void testRepeatObjectRecursive() {
-        // C -> B -> A -> D -> C ...
-        //        -> D -> C ...
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB");
-        RecursiveBean ObjC = new RecursiveBean("ObjC");
-        RecursiveBean ObjD = new RecursiveBean("ObjD");
-        ObjC.setRef(ObjB);
-        ObjB.setRef(ObjA);
-        ObjB.setRef2(ObjD);
-        ObjA.setRef(ObjD);
-        ObjD.setRef(ObjC);
-        new JSONObject(ObjC);
-        fail("Expected an exception");
-    }
-    @Test
-    public void testRepeatObjectNotRecursive() {
-        // C -> B -> A
-        //        -> A
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB");
-        RecursiveBean ObjC = new RecursiveBean("ObjC");
-        ObjC.setRef(ObjA);
-        ObjB.setRef(ObjA);
-        ObjB.setRef2(ObjA);
-        JSONObject j0 = new JSONObject(ObjC);
-        JSONObject j1 = new JSONObject(ObjB);
-        JSONObject j2 = new JSONObject(ObjA);
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                j0, j1, j2
-        )));
-    }
-    @Test
-    public void testLongRepeatObjectNotRecursive() {
-        // C -> B -> A -> D -> E
-        //        -> D -> E
-        RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB");
-        RecursiveBean ObjC = new RecursiveBean("ObjC");
-        RecursiveBean ObjD = new RecursiveBean("ObjD");
-        RecursiveBean ObjE = new RecursiveBean("ObjE");
-        ObjC.setRef(ObjB);
-        ObjB.setRef(ObjA);
-        ObjB.setRef2(ObjD);
-        ObjA.setRef(ObjD);
-        ObjD.setRef(ObjE);
-        JSONObject j0 = new JSONObject(ObjC);
-        JSONObject j1 = new JSONObject(ObjB);
-        JSONObject j2 = new JSONObject(ObjA);
-        JSONObject j3 = new JSONObject(ObjD);
-        JSONObject j4 = new JSONObject(ObjE);
-        Util.checkJSONObjectsMaps(new ArrayList(Arrays.asList(
-                j0, j1, j2, j3, j4
-        )));
-    }
-    @Test(expected=JSONException.class)
-    public void testRecursiveEquals() {
-        RecursiveBeanEquals a = new RecursiveBeanEquals("same");
-        a.setRef(a);
-        JSONObject j0 = new JSONObject(a);
-        Util.checkJSONObjectMaps(j0);
-    }
-    @Test
-    public void testNotRecursiveEquals() {
-        RecursiveBeanEquals a = new RecursiveBeanEquals("same");
-        RecursiveBeanEquals b = new RecursiveBeanEquals("same");
-        RecursiveBeanEquals c = new RecursiveBeanEquals("same");
-        a.setRef(b);
-        b.setRef(c);
-        JSONObject j0 = new JSONObject(a);
-        Util.checkJSONObjectMaps(j0);
-    }
-
-
-    @Test
-    public void testIssue548ObjectWithEmptyJsonArray() {
-        JSONObject jsonObject = new JSONObject("{\"empty_json_array\": []}");
-        assertTrue("missing expected key 'empty_json_array'", jsonObject.has("empty_json_array"));
-        assertNotNull("'empty_json_array' should be an array", jsonObject.getJSONArray("empty_json_array"));
-        assertEquals("'empty_json_array' should have a length of 0", 0, jsonObject.getJSONArray("empty_json_array").length());
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-    * Tests if calling JSONObject clear() method actually makes the JSONObject empty
-    */
-    @Test(expected = JSONException.class)
-    public void jsonObjectClearMethodTest() {
-        //Adds random stuff to the JSONObject
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("key1", 123);
-        jsonObject.put("key2", "456");
-        jsonObject.put("key3", new JSONObject());
-        jsonObject.clear(); //Clears the JSONObject
-        assertTrue("expected jsonObject.length() == 0", jsonObject.length() == 0); //Check if its length is 0
-        jsonObject.getInt("key1"); //Should throws org.json.JSONException: JSONObject["asd"] not found
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
-    /**
-    * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
-    */
-    @Test(expected = JSONException.class)
-    public void issue654StackOverflowInput() {
-        //String base64Bytes ="eyJHWiI6Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7c3t7e3t7e3vPAAAAAAAAAHt7e3t7e3t7e3t7e3t7e3t7e3t7e1ste3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e88AAAAAAAAAe3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7f3syMv//e3t7e3t7e3t7e3t7e3sx//////8=";
-        //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
-        String input = "{\"GZ\":[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{  {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{  {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{  {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{s{{{{{{{";
-        JSONObject json_input = new JSONObject(input);
-        assertNotNull(json_input);
-        fail("Excepected Exception.");
-        Util.checkJSONObjectMaps(json_input);
-    }
-
-    /**
-    * Tests for incorrect object/array nesting. See https://github.com/stleary/JSON-java/issues/654
-    */
-    @Test(expected = JSONException.class)
-    public void issue654IncorrectNestingNoKey1() {
-        JSONObject json_input = new JSONObject("{{\"a\":0}}");
-        assertNotNull(json_input);
-        fail("Expected Exception.");
-    }
-
-    /**
-    * Tests for incorrect object/array nesting. See https://github.com/stleary/JSON-java/issues/654
-    */
-    @Test(expected = JSONException.class)
-    public void issue654IncorrectNestingNoKey2() {
-        JSONObject json_input = new JSONObject("{[\"a\"]}");
-        assertNotNull(json_input);
-        fail("Excepected Exception.");
-    }
-    
-    /**
-    * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
-    */
-    @Ignore("This test relies on system constraints and may not always pass. See: https://github.com/stleary/JSON-java/issues/821")
-    @Test(expected = JSONException.class)
-    public void issue654StackOverflowInputWellFormed() {
-        //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
-        final InputStream resourceAsStream = JSONObjectTest.class.getClassLoader().getResourceAsStream("Issue654WellFormedObject.json");
-        JSONTokener tokener = new JSONTokener(resourceAsStream);
-        JSONObject json_input = new JSONObject(tokener);
-        assertNotNull(json_input);
-        fail("Excepected Exception due to stack overflow.");
-    }
-
-    @Test
-    public void testIssue682SimilarityOfJSONString() {
-        JSONObject jo1 = new JSONObject()
-                .put("a", new MyJsonString())
-                .put("b", 2);
-        JSONObject jo2 = new JSONObject()
-                .put("a", new MyJsonString())
-                .put("b", 2);
-        assertTrue(jo1.similar(jo2));
-
-        JSONObject jo3 = new JSONObject()
-                .put("a", new JSONString() {
-                    @Override
-                    public String toJSONString() {
-                        return "\"different value\"";
-                    }
-                })
-                .put("b", 2);
-        assertFalse(jo1.similar(jo3));
-    }
-
-    private static final Number[] NON_FINITE_NUMBERS = { Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NaN,
-            Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NaN };
-
-    @Test
-    public void issue713MapConstructorWithNonFiniteNumbers() {
-        for (Number nonFinite : NON_FINITE_NUMBERS) {
-            Map map = new HashMap<>();
-            map.put("a", nonFinite);
-
-            assertThrows(JSONException.class, () -> new JSONObject(map));
-        }
-    }
-
-    @Test
-    public void issue713BeanConstructorWithNonFiniteNumbers() {
-        for (Number nonFinite : NON_FINITE_NUMBERS) {
-            GenericBean bean = new GenericBean<>(nonFinite);
-            assertThrows(JSONException.class, () -> new JSONObject(bean));
-        }
-    }
-
-    @Test(expected = JSONException.class)
-    public void issue743SerializationMap() {
-      HashMap map = new HashMap<>();
-      map.put("t", map);
-      JSONObject object = new JSONObject(map);
-      String jsonString = object.toString();
-    }
-
-    @Test(expected = JSONException.class)
-    public void testCircularReferenceMultipleLevel() {
-      HashMap inside = new HashMap<>();
-      HashMap jsonObject = new HashMap<>();
-      inside.put("inside", jsonObject);
-      jsonObject.put("test", inside);
-      new JSONObject(jsonObject);
-    }
-
-    @Test
-    public void issue743SerializationMapWith512Objects() {
-        HashMap map  = buildNestedMap(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
-        JSONObject object = new JSONObject(map);
-        String jsonString = object.toString();
-    }
-
-    @Test
-    public void issue743SerializationMapWith1000Objects() {
-      HashMap map  = buildNestedMap(1000);
-      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
-      JSONObject object = new JSONObject(map, parserConfiguration);
-      String jsonString = object.toString();
-    }
-
-    @Test(expected = JSONException.class)
-    public void issue743SerializationMapWith1001Objects() {
-        HashMap map  = buildNestedMap(1001);
-        JSONObject object = new JSONObject(map);
-        String jsonString = object.toString();
-    }
-
-    @Test(expected = JSONException.class)
-    public void testCircleReferenceFirstLevel() {
-        Map jsonObject = new HashMap<>();
-
-        jsonObject.put("test", jsonObject);
-
-        new JSONObject(jsonObject, new JSONParserConfiguration());
-    }
-
-    @Test(expected = StackOverflowError.class)
-    public void testCircleReferenceMultiplyLevel_notConfigured_expectedStackOverflow() {
-        Map inside = new HashMap<>();
-
-        Map jsonObject = new HashMap<>();
-        inside.put("test", jsonObject);
-        jsonObject.put("test", inside);
-
-        new JSONObject(jsonObject, new JSONParserConfiguration().withMaxNestingDepth(99999));
-    }
-
-    @Test(expected = JSONException.class)
-    public void testCircleReferenceMultiplyLevel_configured_expectedJSONException() {
-        Map inside = new HashMap<>();
-
-        Map jsonObject = new HashMap<>();
-        inside.put("test", jsonObject);
-        jsonObject.put("test", inside);
-
-        new JSONObject(jsonObject, new JSONParserConfiguration());
-    }
-
-    @Test
-    public void testDifferentKeySameInstanceNotACircleReference() {
-        Map map1 = new HashMap<>();
-        Map map2 = new HashMap<>();
-
-        map1.put("test1", map2);
-        map1.put("test2", map2);
-
-        new JSONObject(map1);
-    }
-
-    @Test
-    public void clarifyCurrentBehavior() {
-        // Behavior documented in #653 optLong vs getLong inconsistencies
-        // This problem still exists.
-        // Internally, both number_1 and number_2 are stored as strings. This is reasonable since they are parsed as strings.
-        // However, getLong and optLong should return similar results
-        JSONObject json = new JSONObject("{\"number_1\":\"01234\", \"number_2\": \"332211\"}");
-        assertEquals(json.getLong("number_1"), 1234L);
-        assertEquals(json.optLong("number_1"), 0); //THIS VALUE IS NOT RETURNED AS A NUMBER
-        assertEquals(json.getLong("number_2"), 332211L);
-        assertEquals(json.optLong("number_2"), 332211L);
-
-        // Behavior documented in #826 JSONObject parsing 0-led numeric strings as ints
-        // After reverting the code, personId is stored as a string, and the behavior is as expected
-        String personId = "\"0123\"";
-        JSONObject j1 = new JSONObject("{\"personId\": " + personId + "}");
-        assertEquals(j1.getString("personId"), "0123");
-
-        // Also #826. Here is input with missing quotes. Because of the leading zero, it should not be parsed as a number.
-        // This example was mentioned in the same ticket
-        // After reverting the code, personId is stored as a string, and the behavior is as expected
-        JSONObject j2 = new JSONObject("{\"personId\":\"0123\"}");
-        assertEquals(j2.getString("personId"), "0123");
-
-        // Behavior uncovered while working on the code
-        // All of the values are stored as strings except for hex4, which is stored as a number. This is probably incorrect
-        JSONObject j3 = new JSONObject("{ " +
-                "\"hex1\": \"010e4\", \"hex2\": \"00f0\", \"hex3\": \"0011\", " +
-                "\"hex4\": 00e0, \"hex5\": \"00f0\", \"hex6\": \"0011\" }");
-        assertEquals(j3.getString("hex1"), "010e4");
-        assertEquals(j3.getString("hex2"), "00f0");
-        assertEquals(j3.getString("hex3"), "0011");
-        assertEquals(j3.getLong("hex4"), 0, .1);
-        assertEquals(j3.getString("hex5"), "00f0");
-        assertEquals(j3.getString("hex6"), "0011");
-    }
-
-
-    @Test
-    public void testStrictModeJSONTokener_expectException(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
-        JSONTokener tokener = new JSONTokener("{\"key\":\"value\"}invalidCharacters", jsonParserConfiguration);
-
-        assertThrows(JSONException.class, () -> { new JSONObject(tokener); });
-    }
-
-    /**
-     * Method to build nested map of max maxDepth
-     *
-     * @param maxDepth
-     * @return
-     */
-    public static HashMap buildNestedMap(int maxDepth) {
-        if (maxDepth <= 0) {
-            return new HashMap<>();
-        }
-        HashMap nestedMap = new HashMap<>();
-        nestedMap.put("t", buildNestedMap(maxDepth - 1));
-        return nestedMap;
-    }
-
-}
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
deleted file mode 100644
index 926c49f..0000000
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ /dev/null
@@ -1,624 +0,0 @@
-package org.json.junit;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONParserConfiguration;
-import org.json.JSONTokener;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class JSONParserConfigurationTest {
-    private static final String TEST_SOURCE = "{\"key\": \"value1\", \"key\": \"value2\"}";
-
-    @Test(expected = JSONException.class)
-    public void testThrowException() {
-        new JSONObject(TEST_SOURCE);
-    }
-
-    @Test
-    public void testOverwrite() {
-        JSONObject jsonObject = new JSONObject(TEST_SOURCE,
-                new JSONParserConfiguration().withOverwriteDuplicateKey(true));
-
-        assertEquals("duplicate key should be overwritten", "value2", jsonObject.getString("key"));
-    }
-
-    @Test
-    public void strictModeIsCloned(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true)
-                .withMaxNestingDepth(12);
-
-        assertTrue(jsonParserConfiguration.isStrictMode());
-    }
-
-    @Test
-    public void maxNestingDepthIsCloned(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withKeepStrings(true)
-                .withStrictMode(true);
-
-        assertTrue(jsonParserConfiguration.isKeepStrings());
-    }
-    
-    @Test
-    public void useNativeNullsIsCloned() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withUseNativeNulls(true)
-                .withStrictMode(true);
-        assertTrue(jsonParserConfiguration.isUseNativeNulls());
-    }
-
-    @Test
-    public void verifyDuplicateKeyThenMaxDepth() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withOverwriteDuplicateKey(true)
-                .withMaxNestingDepth(42);
-
-        assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
-        assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
-    }
-
-    @Test
-    public void verifyMaxDepthThenDuplicateKey() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withMaxNestingDepth(42)
-                .withOverwriteDuplicateKey(true);
-
-        assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
-        assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
-    }
-
-    @Test
-    public void givenInvalidInput_testStrictModeTrue_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        List strictModeInputTestCases = getNonCompliantJSONArrayList();
-        // this is a lot easier to debug when things stop working
-        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
-            String testCase = strictModeInputTestCases.get(i);
-            try {
-                JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-                String s = jsonArray.toString();
-                String msg = "Expected an exception, but got: " + s + " Noncompliant Array index: " + i;
-                fail(msg);
-            } catch (Exception e) {
-                // its all good
-            }
-        }
-    }
-
-    @Test
-    public void givenInvalidInputObjects_testStrictModeTrue_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        List strictModeInputTestCases = getNonCompliantJSONObjectList();
-        // this is a lot easier to debug when things stop working
-        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
-            String testCase = strictModeInputTestCases.get(i);
-            try {
-                JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
-                String s = jsonObject.toString();
-                String msg = "Expected an exception, but got: " + s + " Noncompliant Array index: " + i;
-                fail(msg);
-            } catch (Exception e) {
-                // its all good
-            }
-        }
-    }
-
-    @Test
-    public void givenEmptyArray_testStrictModeTrue_shouldNotThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "[]";
-        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-        assertEquals(testCase, jsonArray.toString());
-    }
-
-    @Test
-    public void givenEmptyObject_testStrictModeTrue_shouldNotThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "{}";
-        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
-        assertEquals(testCase, jsonObject.toString());
-    }
-
-    @Test
-    public void givenValidNestedArray_testStrictModeTrue_shouldNotThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-        String testCase = "[[\"c\"], [10.2], [true, false, true]]";
-
-        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-        JSONArray arrayShouldContainStringAt0 = jsonArray.getJSONArray(0);
-        JSONArray arrayShouldContainNumberAt0 = jsonArray.getJSONArray(1);
-        JSONArray arrayShouldContainBooleanAt0 = jsonArray.getJSONArray(2);
-
-        assertTrue(arrayShouldContainStringAt0.get(0) instanceof String);
-        assertTrue(arrayShouldContainNumberAt0.get(0) instanceof Number);
-        assertTrue(arrayShouldContainBooleanAt0.get(0) instanceof Boolean);
-    }
-
-    @Test
-    public void givenValidNestedObject_testStrictModeTrue_shouldNotThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-        String testCase = "{\"a0\":[\"c\"], \"a1\":[10.2], \"a2\":[true, false, true]}";
-
-        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
-        JSONArray arrayShouldContainStringAt0 = jsonObject.getJSONArray("a0");
-        JSONArray arrayShouldContainNumberAt0 = jsonObject.getJSONArray("a1");
-        JSONArray arrayShouldContainBooleanAt0 = jsonObject.getJSONArray("a2");
-
-        assertTrue(arrayShouldContainStringAt0.get(0) instanceof String);
-        assertTrue(arrayShouldContainNumberAt0.get(0) instanceof Number);
-        assertTrue(arrayShouldContainBooleanAt0.get(0) instanceof Boolean);
-    }
-
-    @Test
-    public void givenValidEmptyArrayInsideArray_testStrictModeTrue_shouldNotThrowJsonException(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "[[]]";
-        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-        assertEquals(testCase, jsonArray.toString());
-    }
-
-    @Test
-    public void givenValidEmptyArrayInsideObject_testStrictModeTrue_shouldNotThrowJsonException(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "{\"a0\":[]}";
-        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
-        assertEquals(testCase, jsonObject.toString());
-    }
-
-    @Test
-    public void givenValidEmptyArrayInsideArray_testStrictModeFalse_shouldNotThrowJsonException(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-        String testCase = "[[]]";
-        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-        assertEquals(testCase, jsonArray.toString());
-    }
-
-    @Test
-    public void givenValidEmptyArrayInsideObject_testStrictModeFalse_shouldNotThrowJsonException(){
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-        String testCase = "{\"a0\":[]}";
-        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
-        assertEquals(testCase, jsonObject.toString());
-    }
-
-    @Test
-    public void givenInvalidStringArray_testStrictModeTrue_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "[badString]";
-        JSONException je = assertThrows(JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidStringObject_testStrictModeTrue_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "{\"a0\":badString}";
-        JSONException je = assertThrows(JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Value 'badString' is not surrounded by quotes at 15 [character 16 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void allowNullArrayInStrictMode() {
-        String expected = "[null]";
-        JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
-        assertEquals(expected, jsonArray.toString());
-    }
-
-    @Test
-    public void allowNullObjectInStrictMode() {
-        String expected = "{\"a0\":null}";
-        JSONObject jsonObject = new JSONObject(expected, new JSONParserConfiguration().withStrictMode(true));
-        assertEquals(expected, jsonObject.toString());
-    }
-
-    @Test
-    public void shouldHandleNumericArray() {
-        String expected = "[10]";
-        JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
-        assertEquals(expected, jsonArray.toString());
-    }
-
-    @Test
-    public void shouldHandleNumericObject() {
-        String expected = "{\"a0\":10}";
-        JSONObject jsonObject = new JSONObject(expected, new JSONParserConfiguration().withStrictMode(true));
-        assertEquals(expected, jsonObject.toString());
-    }
-    @Test
-    public void givenCompliantJSONArrayFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException {
-        try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonArray.json"))) {
-            String compliantJsonArrayAsString = lines.collect(Collectors.joining());
-            JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                    .withStrictMode(true);
-            new JSONArray(compliantJsonArrayAsString, jsonParserConfiguration);
-        }
-    }
-
-    @Test
-    public void givenCompliantJSONObjectFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException {
-        try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonObject.json"))) {
-            String compliantJsonObjectAsString = lines.collect(Collectors.joining());
-            JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                    .withStrictMode(true);
-
-            new JSONObject(compliantJsonObjectAsString, jsonParserConfiguration);
-        }
-    }
-
-    @Test
-    public void givenInvalidInputArrays_testStrictModeFalse_shouldNotThrowAnyException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-
-        List strictModeInputTestCases = getNonCompliantJSONArrayList();
-
-        // this is a lot easier to debug when things stop working
-        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
-            String testCase = strictModeInputTestCases.get(i);
-            try {
-                JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-            } catch (Exception e) {
-                System.out.println("Unexpected exception: " + e.getMessage() + " Noncompliant Array index: " + i);
-                fail(String.format("Noncompliant array index: %d", i));
-            }
-        }
-    }
-
-    @Test
-    public void givenInvalidInputObjects_testStrictModeFalse_shouldNotThrowAnyException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-
-        List strictModeInputTestCases = getNonCompliantJSONObjectList();
-
-        // this is a lot easier to debug when things stop working
-        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
-            String testCase = strictModeInputTestCases.get(i);
-            try {
-                JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
-            } catch (Exception e) {
-                System.out.println("Unexpected exception: " + e.getMessage() + " Noncompliant Array index: " + i);
-                fail(String.format("Noncompliant array index: %d", i));
-            }
-        }
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "[1,2];[3,4]";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Unparsed characters found at end of input text at 6 [character 7 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "{\"a0\":[1,2];\"a1\":[3,4]}";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Invalid character ';' found at 12 [character 13 line 1]", je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "[\"1\",\"2\"];[3,4]";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Unparsed characters found at end of input text at 10 [character 11 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObjectWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "{\"a0\":[\"1\",\"2\"];\"a1\":[3,4]}";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Invalid character ';' found at 16 [character 17 line 1]", je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "[{\"test\": implied}]";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Value 'implied' is not surrounded by quotes at 17 [character 18 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-        String testCase = "{\"a0\":{\"test\": implied}]}";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Strict mode error: Value 'implied' is not surrounded by quotes at 22 [character 23 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeFalse_shouldNotThrowAnyException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-        String testCase = "[{\"test\": implied}]";
-        new JSONArray(testCase, jsonParserConfiguration);
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeFalse_shouldNotThrowAnyException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-        String testCase = "{\"a0\":{\"test\": implied}}";
-        new JSONObject(testCase, jsonParserConfiguration);
-    }
-
-    @Test
-    public void givenNonCompliantQuotesArray_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-        String testCaseOne = "[\"abc', \"test\"]";
-        String testCaseTwo = "['abc\", \"test\"]";
-        String testCaseThree = "['abc']";
-        String testCaseFour = "[{'testField': \"testValue\"}]";
-
-        JSONException jeOne = assertThrows(JSONException.class,
-                () -> new JSONArray(testCaseOne, jsonParserConfiguration));
-        JSONException jeTwo = assertThrows(JSONException.class,
-                () -> new JSONArray(testCaseTwo, jsonParserConfiguration));
-        JSONException jeThree = assertThrows(JSONException.class,
-                () -> new JSONArray(testCaseThree, jsonParserConfiguration));
-        JSONException jeFour = assertThrows(JSONException.class,
-                () -> new JSONArray(testCaseFour, jsonParserConfiguration));
-
-        assertEquals(
-                "Expected a ',' or ']' at 10 [character 11 line 1]",
-                jeOne.getMessage());
-        assertEquals(
-                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
-                jeTwo.getMessage());
-        assertEquals(
-                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
-                jeThree.getMessage());
-        assertEquals(
-                "Strict mode error: Single quoted strings are not allowed at 3 [character 4 line 1]",
-                jeFour.getMessage());
-    }
-
-    @Test
-    public void givenNonCompliantQuotesObject_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-        String testCaseOne = "{\"abc': \"test\"}";
-        String testCaseTwo = "{'abc\": \"test\"}";
-        String testCaseThree = "{\"a\":'abc'}";
-        String testCaseFour = "{'testField': \"testValue\"}";
-
-        JSONException jeOne = assertThrows(JSONException.class,
-                () -> new JSONObject(testCaseOne, jsonParserConfiguration));
-        JSONException jeTwo = assertThrows(JSONException.class,
-                () -> new JSONObject(testCaseTwo, jsonParserConfiguration));
-        JSONException jeThree = assertThrows(JSONException.class,
-                () -> new JSONObject(testCaseThree, jsonParserConfiguration));
-        JSONException jeFour = assertThrows(JSONException.class,
-                () -> new JSONObject(testCaseFour, jsonParserConfiguration));
-
-        assertEquals(
-                "Expected a ':' after a key at 10 [character 11 line 1]",
-                jeOne.getMessage());
-        assertEquals(
-                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
-                jeTwo.getMessage());
-        assertEquals(
-                "Strict mode error: Single quoted strings are not allowed at 6 [character 7 line 1]",
-                jeThree.getMessage());
-        assertEquals(
-                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
-                jeFour.getMessage());
-    }
-
-    @Test
-    public void givenUnbalancedQuotesArray_testStrictModeFalse_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-
-        String testCaseOne = "[\"abc', \"test\"]";
-        String testCaseTwo = "['abc\", \"test\"]";
-
-        JSONException jeOne = assertThrows(JSONException.class,
-                () -> new JSONArray(testCaseOne, jsonParserConfiguration));
-        JSONException jeTwo = assertThrows(JSONException.class,
-                () -> new JSONArray(testCaseTwo, jsonParserConfiguration));
-
-        assertEquals("Expected a ',' or ']' at 10 [character 11 line 1]", jeOne.getMessage());
-        assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage());
-    }
-
-    @Test
-    public void givenUnbalancedQuotesObject_testStrictModeFalse_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(false);
-
-        String testCaseOne = "{\"abc': \"test\"}";
-        String testCaseTwo = "{'abc\": \"test\"}";
-
-        JSONException jeOne = assertThrows(JSONException.class,
-                () -> new JSONObject(testCaseOne, jsonParserConfiguration));
-        JSONException jeTwo = assertThrows(JSONException.class,
-                () -> new JSONObject(testCaseTwo, jsonParserConfiguration));
-
-        assertEquals("Expected a ':' after a key at 10 [character 11 line 1]", jeOne.getMessage());
-        assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurroundedByQuotesErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-        String testCase = "[{test: implied}]";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
-        assertEquals("Strict mode error: Value 'test' is not surrounded by quotes at 6 [character 7 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_shouldThrowKeyNotSurroundedByQuotesErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-        String testCase = "{test: implied}";
-        JSONException je = assertThrows("expected non-compliant json but got instead: " + testCase,
-                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-
-        assertEquals("Strict mode error: Value 'test' is not surrounded by quotes at 5 [character 6 line 1]",
-                je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_JSONObjectUsingJSONTokener_shouldThrowJSONException() {
-        JSONException exception = assertThrows(JSONException.class, () -> {
-            new JSONObject(new JSONTokener("{\"key\":\"value\"} invalid trailing text"), new JSONParserConfiguration().withStrictMode(true));
-        });
-
-        assertEquals("Strict mode error: Unparsed characters found at end of input text at 17 [character 18 line 1]", exception.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_JSONObjectUsingString_shouldThrowJSONException() {
-        JSONException exception = assertThrows(JSONException.class, () -> {
-            new JSONObject("{\"key\":\"value\"} invalid trailing text", new JSONParserConfiguration().withStrictMode(true));
-        });
-        assertEquals("Strict mode error: Unparsed characters found at end of input text at 17 [character 18 line 1]", exception.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_JSONArrayUsingJSONTokener_shouldThrowJSONException() {
-        JSONException exception = assertThrows(JSONException.class, () -> {
-            new JSONArray(new JSONTokener("[\"value\"] invalid trailing text"), new JSONParserConfiguration().withStrictMode(true));
-        });
-
-        assertEquals("Strict mode error: Unparsed characters found at end of input text at 11 [character 12 line 1]", exception.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputObject_testStrictModeTrue_JSONArrayUsingString_shouldThrowJSONException() {
-        JSONException exception = assertThrows(JSONException.class, () -> {
-            new JSONArray("[\"value\"] invalid trailing text", new JSONParserConfiguration().withStrictMode(true));
-        });
-        assertEquals("Strict mode error: Unparsed characters found at end of input text at 11 [character 12 line 1]", exception.getMessage());
-    }
-
-    /**
-     * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
-     * this class.
-     *
-     * @return List with JSON strings.
-     */
-    private List getNonCompliantJSONArrayList() {
-        return Arrays.asList(
-                "[1],",
-                "[1,]",
-                "[,]",
-                "[,,]",
-                "[[1],\"sa\",[2]]a",
-                "[1],\"dsa\": \"test\"",
-                "[[a]]",
-                "[]asdf",
-                "[]]",
-                "[]}",
-                "[][",
-                "[]{",
-                "[],",
-                "[]:",
-                "[],[",
-                "[],{",
-                "[1,2];[3,4]",
-                "[test]",
-                "[{'testSingleQuote': 'testSingleQuote'}]",
-                "[1, 2,3]:[4,5]",
-                "[{test: implied}]",
-                "[{\"test\": implied}]",
-                "[{\"number\":\"7990154836330\",\"color\":'c'},{\"number\":8784148854580,\"color\":RosyBrown},{\"number\":\"5875770107113\",\"color\":\"DarkSeaGreen\"}]",
-                "[{test: \"implied\"}]");
-    }
-
-    /**
-     * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
-     * this class.
-     *
-     * @return List with JSON strings.
-     */
-    private List getNonCompliantJSONObjectList() {
-        return Arrays.asList(
-                "{\"a\":1},",
-                "{\"a\":1,}",
-                "{\"a0\":[1],\"a1\":\"sa\",\"a2\":[2]}a",
-                "{\"a\":1},\"dsa\": \"test\"",
-                "{\"a\":[a]}",
-                "{}asdf",
-                "{}}",
-                "{}]",
-                "{}{",
-                "{}[",
-                "{},",
-                "{}:",
-                "{},{",
-                "{},[",
-                "{\"a0\":[1,2];\"a1\":[3,4]}",
-                "{\"a\":test}",
-                "{a:{'testSingleQuote': 'testSingleQuote'}}",
-                "{\"a0\":1, \"a1\":2,\"a2\":3}:{\"a3\":4,\"a4\":5}",
-                "{\"a\":{test: implied}}",
-                "{a:{\"test\": implied}}",
-                "{a:[{\"number\":\"7990154836330\",\"color\":'c'},{\"number\":8784148854580,\"color\":RosyBrown},{\"number\":\"5875770107113\",\"color\":\"DarkSeaGreen\"}]}",
-                "{a:{test: \"implied\"}}"
-        );
-    }
-
-}
diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
deleted file mode 100644
index a420b29..0000000
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.InputStream;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONPointer;
-import org.json.JSONPointerException;
-import org.json.JSONTokener;
-import org.junit.Test;
-
-public class JSONPointerTest {
-
-    private static final JSONObject document;
-    private static final String EXPECTED_COMPLETE_DOCUMENT = "{\"\":0,\" \":7,\"g|h\":4,\"c%d\":2,\"k\\\"l\":6,\"a/b\":1,\"i\\\\j\":5," +
-    		"\"obj\":{\"\":{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some other value\"}," +
-            "\"other~key\":{\"another/key\":[\"val\"]},\"key\":\"value\"},\"foo\":[\"bar\",\"baz\"],\"e^f\":3," +
-            "\"m~n\":8}";
-
-    
-    static {
-        @SuppressWarnings("resource")
-        InputStream resourceAsStream = JSONPointerTest.class.getClassLoader().getResourceAsStream("jsonpointer-testdoc.json");
-        if(resourceAsStream == null) {
-            throw new ExceptionInInitializerError("Unable to locate test file. Please check your development environment configuration");
-        }
-        document = new JSONObject(new JSONTokener(resourceAsStream));
-    }
-
-    private Object query(String pointer) {
-        return new JSONPointer(pointer).queryFrom(document);
-    }
-
-    @Test
-    public void emptyPointer() {
-        assertTrue(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).similar(query("")));
-    }
-
-    @SuppressWarnings("unused")
-    @Test(expected = NullPointerException.class)
-    public void nullPointer() {
-        new JSONPointer((String) null);
-    }
-
-    @Test
-    public void objectPropertyQuery() {
-        assertEquals("[\"bar\",\"baz\"]", query("/foo").toString());
-    }
-
-    @Test
-    public void arrayIndexQuery() {
-        assertEquals("bar", query("/foo/0"));
-    }
-
-    @Test(expected = JSONPointerException.class)
-    public void stringPropOfArrayFailure() {
-        query("/foo/bar");
-    }
-
-    @Test
-    public void queryByEmptyKey() {
-        assertEquals(0, query("/"));
-    }
-
-    @Test
-    public void queryByEmptyKeySubObject() {
-        JSONObject json = new JSONObject("{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some" +
-                " other value\"}");
-        JSONObject obj = (JSONObject) query("/obj/");
-        assertTrue(json.similar(obj));
-    }
-
-    @Test
-    public void queryByEmptyKeySubObjectSubOject() {
-        assertEquals("empty key of an object with an empty key", query("/obj//"));
-    }
-    
-    @Test
-    public void queryByEmptyKeySubObjectValue() {
-        assertEquals("Some other value", query("/obj//subKey"));
-    }
-
-    @Test
-    public void slashEscaping() {
-        assertEquals(1, query("/a~1b"));
-    }
-
-    @Test
-    public void tildeEscaping() {
-        assertEquals(8, query("/m~0n"));
-    }
-
-    /**
-     * We pass backslashes as-is
-     * 
-     * @see rfc6901 section 3
-     */
-    @Test
-    public void backslashHandling() {
-        assertEquals(5, query("/i\\j"));
-    }
-    
-    /**
-     * We pass quotations as-is
-     * 
-     * @see rfc6901 section 3
-     */
-    @Test
-    public void quotationHandling() {
-        assertEquals(6, query("/k\"l"));
-    }
-   
-    @Test
-    public void whitespaceKey() {
-        assertEquals(7, query("/ "));
-    }
-
-    @Test
-    public void uriFragmentNotation() {
-        assertEquals("[\"bar\",\"baz\"]", query("#/foo").toString());
-    }
-
-    @Test
-    public void uriFragmentNotationRoot() {
-        assertTrue(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).similar(query("#")));
-    }
-
-    @Test
-    public void uriFragmentPercentHandling() {
-        assertEquals(2, query("#/c%25d"));
-        assertEquals(3, query("#/e%5Ef"));
-        assertEquals(4, query("#/g%7Ch"));
-        assertEquals(8, query("#/m~0n"));
-    }
-
-    @SuppressWarnings("unused")
-    @Test(expected = IllegalArgumentException.class)
-    public void syntaxError() {
-        new JSONPointer("key");
-    }
-
-    @Test(expected = JSONPointerException.class)
-    public void arrayIndexFailure() {
-        query("/foo/2");
-    }
-
-    @Test(expected = JSONPointerException.class)
-    public void primitiveFailure() {
-        query("/obj/key/failure");
-    }
-    
-    @Test
-    public void builderTest() {
-        JSONPointer pointer = JSONPointer.builder()
-                .append("obj")
-                .append("other~key").append("another/key")
-                .append(0)
-                .build();
-        assertEquals("val", pointer.queryFrom(document));
-    }
-    
-    @Test(expected = NullPointerException.class)
-    public void nullToken() {
-        JSONPointer.builder().append(null);
-    }
-    
-    @Test
-    public void toStringEscaping() {
-        JSONPointer pointer = JSONPointer.builder()
-                .append("obj")
-                .append("other~key").append("another/key")
-                .append("\"")
-                .append(0)
-                .build();
-        assertEquals("/obj/other~0key/another~1key/\"/0", pointer.toString());
-    }
-    
-    @Test
-    public void emptyPointerToString() {
-        assertEquals("", new JSONPointer("").toString());
-    }
-    
-    @Test
-    public void toURIFragment() {
-        assertEquals("#/c%25d", new JSONPointer("/c%d").toURIFragment());
-        assertEquals("#/e%5Ef", new JSONPointer("/e^f").toURIFragment());
-        assertEquals("#/g%7Ch", new JSONPointer("/g|h").toURIFragment());
-        assertEquals("#/m%7En", new JSONPointer("/m~n").toURIFragment());
-    }
-    
-    @Test
-    public void tokenListIsCopiedInConstructor() {
-        JSONPointer.Builder b = JSONPointer.builder().append("key1");
-        JSONPointer jp1 = b.build();
-        b.append("key2");
-        JSONPointer jp2 = b.build();
-        if(jp1.toString().equals(jp2.toString())) {
-            fail("Oops, my pointers are sharing a backing array");
-        }
-    }
-
-    /**
-     * Coverage for JSONObject query(String)
-     */
-    @Test
-    public void queryFromJSONObject() {
-        String str = "{"+
-                "\"stringKey\":\"hello world!\","+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\": {"+
-                    "\"a\":\"aVal\","+
-                    "\"b\":\"bVal\""+
-                "}"+
-            "}";    
-        JSONObject jsonObject = new JSONObject(str);
-        Object obj = jsonObject.query("/stringKey");
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-        obj = jsonObject.query("/arrayKey/1");
-        assertTrue("Expected 1", Integer.valueOf(1).equals(obj));
-        obj = jsonObject.query("/objectKey/b");
-        assertTrue("Expected bVal", "bVal".equals(obj));
-        try {
-            obj = jsonObject.query("/a/b/c");
-            assertTrue("Expected JSONPointerException", false);
-        } catch (JSONPointerException e) {
-            assertTrue("Expected bad key/value exception",
-                    "value [null] is not an array or object therefore its key b cannot be resolved".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Coverage for JSONObject query(JSONPointer)
-     */
-    @Test
-    public void queryFromJSONObjectUsingPointer() {
-        String str = "{"+
-                "\"stringKey\":\"hello world!\","+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\": {"+
-                    "\"a\":\"aVal\","+
-                    "\"b\":\"bVal\""+
-                "}"+
-            "}";    
-        JSONObject jsonObject = new JSONObject(str);
-        Object obj = jsonObject.query(new JSONPointer("/stringKey"));
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-        obj = jsonObject.query(new JSONPointer("/arrayKey/1"));
-        assertTrue("Expected 1", Integer.valueOf(1).equals(obj));
-        obj = jsonObject.query(new JSONPointer("/objectKey/b"));
-        assertTrue("Expected bVal", "bVal".equals(obj));
-        try {
-            obj = jsonObject.query(new JSONPointer("/a/b/c"));
-            assertTrue("Expected JSONPointerException", false);
-        } catch (JSONPointerException e) {
-            assertTrue("Expected bad key/value exception",
-                    "value [null] is not an array or object therefore its key b cannot be resolved".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Coverage for JSONObject optQuery(JSONPointer)
-     */
-    @Test
-    public void optQueryFromJSONObjectUsingPointer() {
-        String str = "{"+
-                "\"stringKey\":\"hello world!\","+
-                "\"arrayKey\":[0,1,2],"+
-                "\"objectKey\": {"+
-                    "\"a\":\"aVal\","+
-                    "\"b\":\"bVal\""+
-                "}"+
-            "}";    
-        JSONObject jsonObject = new JSONObject(str);
-        Object obj = jsonObject.optQuery(new JSONPointer("/stringKey"));
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-        obj = jsonObject.optQuery(new JSONPointer("/arrayKey/1"));
-        assertTrue("Expected 1", Integer.valueOf(1).equals(obj));
-        obj = jsonObject.optQuery(new JSONPointer("/objectKey/b"));
-        assertTrue("Expected bVal", "bVal".equals(obj));
-        obj = jsonObject.optQuery(new JSONPointer("/a/b/c"));
-        assertTrue("Expected null", obj == null);
-    }
-    
-    /**
-     * Coverage for JSONArray query(String)
-     */
-    @Test
-    public void queryFromJSONArray() {
-        String str = "["+
-                "\"hello world!\","+
-                "[0,1,2],"+
-                "{"+
-                    "\"a\":\"aVal\","+
-                    "\"b\":\"bVal\""+
-                "}"+
-            "]";    
-        JSONArray jsonArray = new JSONArray(str);
-        Object obj = jsonArray.query("/0");
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-        obj = jsonArray.query("/1/1");
-        assertTrue("Expected 1", Integer.valueOf(1).equals(obj));
-        obj = jsonArray.query("/2/b");
-        assertTrue("Expected bVal", "bVal".equals(obj));
-        try {
-            obj = jsonArray.query("/a/b/c");
-            assertTrue("Expected JSONPointerException", false);
-        } catch (JSONPointerException e) {
-            assertTrue("Expected bad index exception",
-                    "a is not an array index".equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Coverage for JSONArray query(JSONPointer)
-     */
-    @Test
-    public void queryFromJSONArrayUsingPointer() {
-        String str = "["+
-                "\"hello world!\","+
-                "[0,1,2],"+
-                "{"+
-                    "\"a\":\"aVal\","+
-                    "\"b\":\"bVal\""+
-                "}"+
-            "]";    
-        JSONArray jsonArray = new JSONArray(str);
-        Object obj = jsonArray.query(new JSONPointer("/0"));
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-        obj = jsonArray.query(new JSONPointer("/1/1"));
-        assertTrue("Expected 1", Integer.valueOf(1).equals(obj));
-        obj = jsonArray.query(new JSONPointer("/2/b"));
-        assertTrue("Expected bVal", "bVal".equals(obj));
-        try {
-            obj = jsonArray.query(new JSONPointer("/a/b/c"));
-            assertTrue("Expected JSONPointerException", false);
-        } catch (JSONPointerException e) {
-            assertTrue("Expected bad index exception",
-                    "a is not an array index".equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Coverage for JSONArray optQuery(JSONPointer)
-     */
-    @Test
-    public void optQueryFromJSONArrayUsingPointer() {
-        String str = "["+
-                "\"hello world!\","+
-                "[0,1,2],"+
-                "{"+
-                    "\"a\":\"aVal\","+
-                    "\"b\":\"bVal\""+
-                "}"+
-            "]";    
-        JSONArray jsonArray = new JSONArray(str);
-        Object obj = jsonArray.optQuery(new JSONPointer("/0"));
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-        obj = jsonArray.optQuery(new JSONPointer("/1/1"));
-        assertTrue("Expected 1", Integer.valueOf(1).equals(obj));
-        obj = jsonArray.optQuery(new JSONPointer("/2/b"));
-        assertTrue("Expected bVal", "bVal".equals(obj));
-        obj = jsonArray.optQuery(new JSONPointer("/a/b/c"));
-        assertTrue("Expected null", obj == null);
-    }
-    
-    /**
-     * When creating a jsonObject we need to parse escaped characters "\\\\"
-     *  --> it's the string representation of  "\\", so when query'ing via the JSONPointer 
-     *  we DON'T escape them
-     *  
-     */
-    @Test
-    public void queryFromJSONObjectUsingPointer0() {
-    	String str = "{"+
-                "\"string\\\\\\\\Key\":\"hello world!\","+
-
-                "\"\\\\\":\"slash test\"" +
-                "}";
-            JSONObject jsonObject = new JSONObject(str);
-            //Summary of issue: When a KEY in the jsonObject is "\\\\" --> it's held
-            // as "\\" which means when querying, we need to use "\\"
-            Object twoBackslahObj = jsonObject.optQuery(new JSONPointer("/\\"));
-            assertEquals("slash test", twoBackslahObj);
-
-            Object fourBackslashObj = jsonObject.optQuery(new JSONPointer("/string\\\\Key"));
-            assertEquals("hello world!", fourBackslashObj);
-    }
-}
diff --git a/src/test/java/org/json/junit/JSONStringTest.java b/src/test/java/org/json/junit/JSONStringTest.java
deleted file mode 100644
index 235df18..0000000
--- a/src/test/java/org/json/junit/JSONStringTest.java
+++ /dev/null
@@ -1,401 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import java.io.StringWriter;
-import java.util.*;
-
-import org.json.*;
-import org.junit.Test;
-
-/**
- * Tests for JSONString implementations, and the difference between
- * {@link JSONObject#valueToString} and {@link JSONObject#writeValue}.
- */
-public class JSONStringTest {
-
-    /**
-     * This tests the JSONObject.writeValue() method. We can't test directly
-     * due to it being a package-protected method. Instead, we can call
-     * JSONArray.write(), which delegates the writing of each entry to
-     * writeValue().
-     */
-    @Test
-    public void writeValues() throws Exception {
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.put((Object)null);
-
-        StringWriter writer = new StringWriter();
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[null]".equals(output));
-    
-            jsonArray = new JSONArray();
-            jsonArray.put(JSONObject.NULL);
-        } finally {
-            writer.close();
-        }
-
-        writer = new StringWriter();
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[null]".equals(output));
-    
-            jsonArray = new JSONArray();
-            jsonArray.put(new JSONObject());
-        } finally {
-            writer.close();
-        }
-        
-        writer = new StringWriter();
-        try  {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[{}]".equals(output));
-    
-            jsonArray = new JSONArray();
-            jsonArray.put(new JSONArray());
-        } finally {
-            writer.close();
-        }
-
-        writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[[]]".equals(output));
-    
-            jsonArray = new JSONArray();
-            Map singleMap = Collections.singletonMap("key1", "value1");
-            jsonArray.put((Object)singleMap);
-        } finally {
-            writer.close();
-        }
-        
-        writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[{\"key1\":\"value1\"}]".equals(output));
-    
-            jsonArray = new JSONArray();
-            List singleList = Collections.singletonList("entry1");
-            jsonArray.put((Object)singleList);
-        } finally {
-            writer.close();
-        }
-
-        writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[[\"entry1\"]]".equals(output));
-    
-            jsonArray = new JSONArray();
-            int[] intArray = new int[] { 1, 2, 3 };
-            jsonArray.put(intArray);
-        } finally {
-            writer.close();
-        }
-
-        writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[[1,2,3]]".equals(output));
-    
-            jsonArray = new JSONArray();
-            jsonArray.put(24);
-        } finally {
-            writer.close();
-        }
-        
-        writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[24]".equals(output));
-    
-            jsonArray = new JSONArray();
-            jsonArray.put("string value");
-        } finally {
-            writer.close();
-        }
-
-        writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[\"string value\"]".equals(output));
-    
-            jsonArray = new JSONArray();
-            jsonArray.put(true);
-        } finally {
-            writer.close();
-        }
-
-        writer = new StringWriter();
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[true]".equals(output));
-        } finally {
-            writer.close();
-        }
-
-    }
-
-    /**
-     * This tests the JSONObject.valueToString() method. These should be
-     * identical to the values above, except for the enclosing [ and ].
-     */
-    @SuppressWarnings("boxing")
-    @Test
-    public void valuesToString() throws Exception {
-
-        String output = JSONObject.valueToString(null);
-        assertTrue("String values should be equal", "null".equals(output));
-
-        output = JSONObject.valueToString(JSONObject.NULL);
-        assertTrue("String values should be equal", "null".equals(output));
-
-        output = JSONObject.valueToString(new JSONObject());
-        assertTrue("String values should be equal", "{}".equals(output));
-
-        output = JSONObject.valueToString(new JSONArray());
-        assertTrue("String values should be equal", "[]".equals(output));
-
-        Map singleMap = Collections.singletonMap("key1", "value1");
-        output = JSONObject.valueToString(singleMap);
-        assertTrue("String values should be equal", "{\"key1\":\"value1\"}".equals(output));
-
-        List singleList = Collections.singletonList("entry1");
-        output = JSONObject.valueToString(singleList);
-        assertTrue("String values should be equal", "[\"entry1\"]".equals(output));
-
-        int[] intArray = new int[] { 1, 2, 3 };
-        output = JSONObject.valueToString(intArray);
-        assertTrue("String values should be equal", "[1,2,3]".equals(output));
-
-        output = JSONObject.valueToString(24);
-        assertTrue("String values should be equal", "24".equals(output));
-
-        output = JSONObject.valueToString("string value");
-        assertTrue("String values should be equal", "\"string value\"".equals(output));
-
-        output = JSONObject.valueToString(true);
-        assertTrue("String values should be equal", "true".equals(output));
-
-    }
-
-    /**
-     * Test what happens when toJSONString() returns a well-formed JSON value.
-     * This is the usual case.
-     */
-    @Test
-    public void testJSONStringValue() throws Exception {
-        JSONStringValue jsonString = new JSONStringValue();
-        JSONArray jsonArray = new JSONArray();
-
-        jsonArray.put(jsonString);
-
-        StringWriter writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[\"the JSON string value\"]".equals(output));
-    
-            output = JSONObject.valueToString(jsonString);
-            assertTrue("String values should be equal", "\"the JSON string value\"".equals(output));
-        } finally {
-            writer.close();
-        }
-    }
-
-    /**
-     * Test what happens when toJSONString() returns null. In one case,
-     * use the object's toString() method. In the other, throw a JSONException.
-     */
-    @Test
-    public void testJSONNullStringValue() throws Exception {
-        JSONNullStringValue jsonString = new JSONNullStringValue();
-        JSONArray jsonArray = new JSONArray();
-
-        jsonArray.put(jsonString);
-
-        StringWriter writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[\"the toString value\"]".equals(output));
-    
-            // The only different between writeValue() and valueToString():
-            // in this case, valueToString throws a JSONException
-            try {
-                output = JSONObject.valueToString(jsonString);
-                fail("Expected an exception, got a String value");
-            } catch (Exception e) {
-                assertTrue("Expected JSONException", e instanceof JSONException);
-                assertTrue("Exception message does not match", "Bad value from toJSONString: null".equals(e.getMessage()));
-            }
-        } finally {
-            writer.close();
-        }
-    }
-
-    /**
-     * Test what happens when toJSONString() returns an exception. In both
-     * cases, a JSONException is thrown, with the cause and message set from
-     * the original exception.
-     */
-    @Test
-    public void testJSONStringExceptionValue() {
-        JSONStringExceptionValue jsonString = new JSONStringExceptionValue();
-        JSONArray jsonArray = new JSONArray();
-
-        jsonArray.put(jsonString);
-
-        StringWriter writer = new StringWriter(); 
-        try {
-            jsonArray.write(writer).toString();
-            fail("Expected an exception, got a String value");
-        } catch (JSONException e) {
-            assertEquals("Unable to write JSONArray value at index: 0", e.getMessage());
-        } catch(Exception e) {
-            fail("Expected JSONException");
-        } finally {
-            try {
-                writer.close();
-            } catch (Exception e){}
-        }
-
-        try {
-            JSONObject.valueToString(jsonString);
-            fail("Expected an exception, got a String value");
-        } catch (JSONException e) {
-            assertTrue("Exception message does not match", "the exception value".equals(e.getMessage()));
-        } catch(Exception e) {
-            fail("Expected JSONException");
-        }
-    }
-
-    /**
-     * Test what happens when a Java object's toString() returns a String value.
-     * This is the usual case.
-     */
-    @Test
-    public void testStringValue() throws Exception {
-        StringValue nonJsonString = new StringValue();
-        JSONArray jsonArray = new JSONArray();
-
-        jsonArray.put(nonJsonString);
-
-        StringWriter writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[\"the toString value for StringValue\"]".equals(output));
-    
-            output = JSONObject.valueToString(nonJsonString);
-            assertTrue("String values should be equal", "\"the toString value for StringValue\"".equals(output));
-        } finally {
-            writer.close();
-        }
-    }
-
-    /**
-     * Test what happens when a Java object's toString() returns null.
-     * Defaults to empty string.
-     */
-    @Test
-    public void testNullStringValue() throws Exception {
-        NullStringValue nonJsonString = new NullStringValue();
-        JSONArray jsonArray = new JSONArray();
-
-        jsonArray.put(nonJsonString);
-
-        StringWriter writer = new StringWriter(); 
-        try {
-            String output = jsonArray.write(writer).toString();
-            assertTrue("String values should be equal", "[\"\"]".equals(output));
-    
-            output = JSONObject.valueToString(nonJsonString);
-            assertTrue("String values should be equal", "\"\"".equals(output));
-        } finally {
-            writer.close();
-        }
-    }
-
-    @Test
-    public void testEnumJSONString() {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("key", MyEnum.MY_ENUM);
-        assertEquals("{\"key\":\"myJsonString\"}", jsonObject.toString());
-    }
-
-    private enum MyEnum implements JSONString {
-        MY_ENUM;
-
-        @Override
-        public String toJSONString() {
-            return "\"myJsonString\"";
-        }
-    }
-
-    /**
-     * A JSONString that returns a valid JSON string value.
-     */
-    private static final class JSONStringValue implements JSONString {
-
-        @Override
-        public String toJSONString() {
-            return "\"the JSON string value\"";
-        }
-
-        @Override
-        public String toString() {
-            return "the toString value for JSONStringValue";
-        }
-    }
-
-    /**
-     * A JSONString that returns null when calling toJSONString().
-     */
-    private static final class JSONNullStringValue implements JSONString {
-
-        @Override
-        public String toJSONString() {
-            return null;
-        }
-
-        @Override
-        public String toString() {
-            return "the toString value";
-        }
-    }
-
-    /**
-     * A JSONString that throw an exception when calling toJSONString().
-     */
-    private static final class JSONStringExceptionValue implements JSONString {
-
-        @Override
-        public String toJSONString() {
-            throw new IllegalStateException("the exception value");
-        }
-
-        @Override
-        public String toString() {
-            return "the toString value for JSONStringExceptionValue";
-        }
-    }
-
-    public static final class StringValue {
-
-        @Override
-        public String toString() {
-            return "the toString value for StringValue";
-        }
-    }
-
-    public static final class NullStringValue {
-
-        @Override
-        public String toString() {
-            return null;
-        }
-    }
-}
diff --git a/src/test/java/org/json/junit/JSONStringerTest.java b/src/test/java/org/json/junit/JSONStringerTest.java
deleted file mode 100644
index 0ecb9d6..0000000
--- a/src/test/java/org/json/junit/JSONStringerTest.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-import org.json.*;
-import org.junit.Test;
-
-import com.jayway.jsonpath.*;
-
-
-/**
- * Tests for JSON-Java JSONStringer and JSONWriter.
- */
-public class JSONStringerTest {
-
-    /**
-     * Object with a null key.
-     * Expects a JSONException.
-     */
-    @Test
-    public void nullKeyException() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object();
-        try {
-            jsonStringer.key(null);
-            assertTrue("Expected an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Null key.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Add a key with no object.
-     * Expects a JSONException.
-     */
-    @Test
-    public void outOfSequenceException() {
-        JSONStringer jsonStringer = new JSONStringer();
-        try {
-            jsonStringer.key("hi");
-            assertTrue("Expected an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Misplaced key.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Missplace an array.
-     * Expects a JSONException
-     */
-    @Test
-    public void missplacedArrayException() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object().endObject();
-        try {
-            jsonStringer.array();
-            assertTrue("Expected an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Misplaced array.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Missplace an endErray.
-     * Expects a JSONException
-     */
-    @Test
-    public void missplacedEndArrayException() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object();
-        try {
-            jsonStringer.endArray();
-            assertTrue("Expected an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Misplaced endArray.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Missplace an endObject.
-     * Expects a JSONException
-     */
-    @Test
-    public void missplacedEndObjectException() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.array();
-        try {
-            jsonStringer.endObject();
-            assertTrue("Expected an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Misplaced endObject.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Missplace an object.
-     * Expects a JSONException.
-     */
-    @Test
-    public void missplacedObjectException() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object().endObject();
-        try {
-            jsonStringer.object();
-            assertTrue("Expected an exception", false);
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Misplaced object.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Exceeds implementation max nesting depth.
-     * Expects a JSONException
-     */
-    @Test
-    public void exceedNestDepthException() {
-        try {
-            JSONStringer s = new JSONStringer();
-            s.object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object();
-            s.key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object().
-            key("k").object().key("k").object().key("k").object().key("k").object().key("k").object();
-            fail("Expected an exception message");
-        } catch (JSONException e) {
-            assertTrue("Expected an exception message",
-                    "Nesting too deep.".
-                    equals(e.getMessage()));
-        }
-    }
-
-    /**
-     * Build a JSON doc using JSONString API calls,
-     * then convert to JSONObject
-     */
-    @Test
-    public void simpleObjectString() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object();
-        jsonStringer.key("trueValue").value(true);
-        jsonStringer.key("falseValue").value(false);
-        jsonStringer.key("nullValue").value(null);
-        jsonStringer.key("stringValue").value("hello world!");
-        jsonStringer.key("complexStringValue").value("h\be\tllo w\u1234orld!");
-        jsonStringer.key("intValue").value(42);
-        jsonStringer.key("doubleValue").value(-23.45e67);
-        jsonStringer.endObject();
-        String str = jsonStringer.toString();
-        JSONObject jsonObject = new JSONObject(str);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 7 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 7);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueValue")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseValue")));
-        assertTrue("expected null", JSONObject.NULL.equals(jsonObject.query("/nullValue")));
-        assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/stringValue")));
-        assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/complexStringValue")));
-        assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/intValue")));
-        assertTrue("expected -23.45e67", BigDecimal.valueOf(-23.45e67).equals(jsonObject.query("/doubleValue")));
-    }
-
-    /**
-     * Build a JSON doc using JSONString API calls,
-     * then convert to JSONArray
-     */
-    @Test
-    public void simpleArrayString() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.array();
-        jsonStringer.value(true);
-        jsonStringer.value(false);
-        jsonStringer.value(null);
-        jsonStringer.value("hello world!");
-        jsonStringer.value(42);
-        jsonStringer.value(-23.45e67);
-        jsonStringer.endArray();
-        String str = jsonStringer.toString();
-        JSONArray jsonArray = new JSONArray(str);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString());
-        assertTrue("expected 6 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 6);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1")));
-        assertTrue("expected null", JSONObject.NULL.equals(jsonArray.query("/2")));
-        assertTrue("expected hello world!", "hello world!".equals(jsonArray.query("/3")));
-        assertTrue("expected 42", Integer.valueOf(42).equals(jsonArray.query("/4")));
-        assertTrue("expected -23.45e67", BigDecimal.valueOf(-23.45e67).equals(jsonArray.query("/5")));
-    }
-
-    /**
-     * Build a nested JSON doc using JSONString API calls, then convert to
-     * JSONObject. Will create a long cascade of output by reusing the
-     * returned values..
-     */
-    @Test
-    public void complexObjectString() {
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object().
-            key("trueValue").value(true).
-            key("falseValue").value(false).
-            key("nullValue").value(null).
-            key("stringValue").value("hello world!").
-            key("object2").object().
-            key("k1").value("v1").
-            key("k2").value("v2").
-            key("k3").value("v3").
-            key("array1").array().
-            value(1).
-            value(2).
-            object().
-            key("k4").value("v4").
-            key("k5").value("v5").
-            key("k6").value("v6").
-            key("array2").array().
-            value(5).
-            value(6).
-            value(7).
-            value(8).
-            endArray().
-            endObject().
-            value(3).
-            value(4).
-            endArray().
-            endObject().
-            key("complexStringValue").value("h\be\tllo w\u1234orld!").
-            key("intValue").value(42).
-            key("doubleValue").value(-23.45e67).
-            endObject();
-        String str = jsonStringer.toString();
-        JSONObject jsonObject = new JSONObject(str);
-
-        // validate JSON content
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 8 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 8);
-        assertTrue("expected 4 object2 items", ((Map)(JsonPath.read(doc, "$.object2"))).size() == 4);
-        assertTrue("expected 5 array1 items", ((List)(JsonPath.read(doc, "$.object2.array1"))).size() == 5);
-        assertTrue("expected 4 array[2] items", ((Map)(JsonPath.read(doc, "$.object2.array1[2]"))).size() == 4);
-        assertTrue("expected 4 array1[2].array2 items", ((List)(JsonPath.read(doc, "$.object2.array1[2].array2"))).size() == 4);
-        assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueValue")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseValue")));
-        assertTrue("expected null", JSONObject.NULL.equals(jsonObject.query("/nullValue")));
-        assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/stringValue")));
-        assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/intValue")));
-        assertTrue("expected -23.45e67", BigDecimal.valueOf(-23.45e67).equals(jsonObject.query("/doubleValue")));
-        assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/complexStringValue")));
-        assertTrue("expected v1", "v1".equals(jsonObject.query("/object2/k1")));
-        assertTrue("expected v2", "v2".equals(jsonObject.query("/object2/k2")));
-        assertTrue("expected v3", "v3".equals(jsonObject.query("/object2/k3")));
-        assertTrue("expected 1", Integer.valueOf(1).equals(jsonObject.query("/object2/array1/0")));
-        assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/object2/array1/1")));
-        assertTrue("expected v4", "v4".equals(jsonObject.query("/object2/array1/2/k4")));
-        assertTrue("expected v5", "v5".equals(jsonObject.query("/object2/array1/2/k5")));
-        assertTrue("expected v6", "v6".equals(jsonObject.query("/object2/array1/2/k6")));
-        assertTrue("expected 5", Integer.valueOf(5).equals(jsonObject.query("/object2/array1/2/array2/0")));
-        assertTrue("expected 6", Integer.valueOf(6).equals(jsonObject.query("/object2/array1/2/array2/1")));
-        assertTrue("expected 7", Integer.valueOf(7).equals(jsonObject.query("/object2/array1/2/array2/2")));
-        assertTrue("expected 8", Integer.valueOf(8).equals(jsonObject.query("/object2/array1/2/array2/3")));
-        assertTrue("expected 3", Integer.valueOf(3).equals(jsonObject.query("/object2/array1/3")));
-        assertTrue("expected 4", Integer.valueOf(4).equals(jsonObject.query("/object2/array1/4")));
-    }
-
-}
diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/org/json/junit/JSONTokenerTest.java
deleted file mode 100644
index b0b45cb..0000000
--- a/src/test/java/org/json/junit/JSONTokenerTest.java
+++ /dev/null
@@ -1,373 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-
-import org.json.*;
-import org.junit.Test;
-
-/**
- * Test specific to the {@link org.json.JSONTokener} class.
- * @author John Aylward
- *
- */
-public class JSONTokenerTest {
-
-    /**
-     * verify that back() fails as expected.
-     * @throws IOException thrown if something unexpected happens.
-     */
-    @Test
-    public void verifyBackFailureZeroIndex() throws IOException {
-        Reader reader = new StringReader("some test string"); 
-        try {
-            final JSONTokener tokener = new JSONTokener(reader);
-            try {
-                // this should fail since the index is 0;
-                tokener.back();
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Stepping back two steps is not supported", e.getMessage());
-            } catch (Exception e) {
-                fail("Unknown Exception type " + e.getClass().getCanonicalName()+" with message "+e.getMessage());
-            }
-            
-        } finally {
-            reader.close();
-        }
-    }
-    /**
-     * verify that back() fails as expected.
-     * @throws IOException thrown if something unexpected happens.
-     */
-    @Test
-    public void verifyBackFailureDoubleBack() throws IOException {
-        Reader reader = new StringReader("some test string");
-        try {
-            final JSONTokener tokener = new JSONTokener(reader);
-            tokener.next();
-            tokener.back();
-            try {
-                // this should fail since the index is 0;
-                tokener.back();
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Stepping back two steps is not supported", e.getMessage());
-            } catch (Exception e) {
-                fail("Unknown Exception type " + e.getClass().getCanonicalName()+" with message "+e.getMessage());
-            }
-       } finally {
-           reader.close();
-       }
-    }
-    
-    @Test
-    public void testValid() {
-        checkValid("0",Number.class);
-        checkValid(" 0  ",Number.class);
-        checkValid("23",Number.class);
-        checkValid("23.5",Number.class);
-        checkValid(" 23.5  ",Number.class);
-        checkValid("null",null);
-        checkValid(" null  ",null);
-        checkValid("true",Boolean.class);
-        checkValid(" true\n",Boolean.class);
-        checkValid("false",Boolean.class);
-        checkValid("\nfalse  ",Boolean.class);
-        checkValid("{}",JSONObject.class);
-        checkValid(" {}  ",JSONObject.class);
-        checkValid("{\"a\":1}",JSONObject.class);
-        checkValid(" {\"a\":1}  ",JSONObject.class);
-        checkValid("[]",JSONArray.class);
-        checkValid(" []  ",JSONArray.class);
-        checkValid("[1,2]",JSONArray.class);
-        checkValid("\n\n[1,2]\n\n",JSONArray.class);
-
-        // Test should fail if default strictMode is true, pass if false
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
-        if (jsonParserConfiguration.isStrictMode()) {
-            try {
-                checkValid("1 2", String.class);
-                assertEquals("Expected to throw exception due to invalid string", true, false);
-            } catch (JSONException e) { }
-        } else {
-            checkValid("1 2", String.class);
-        }
-    }
-    
-    @Test
-    public void testErrors() {
-        // Check that stream can detect that a value is found after
-        // the first one
-        checkError(" { \"a\":1 }  4 ");
-        checkError("null \"a\"");
-        checkError("{} true");
-    }
-    
-    private Object checkValid(String testStr, Class aClass)  {
-        Object result = nextValue(testStr);
-
-        // Check class of object returned
-        if( null == aClass ) {
-            if(JSONObject.NULL.equals(result)) {
-                // OK
-            } else {
-                throw new JSONException("Unexpected class: "+result.getClass().getSimpleName());
-            }
-        } else {
-            if( null == result ) {
-                throw new JSONException("Unexpected null result");
-            } else if(!aClass.isAssignableFrom(result.getClass()) ) {
-                throw new JSONException("Unexpected class: "+result.getClass().getSimpleName());
-            }
-        }
-        
-        return result;
-    }
-
-    private void checkError(String testStr) {
-        try {
-            nextValue(testStr);
-            
-            fail("Error should be triggered: (\""+testStr+"\")");
-        } catch (JSONException e) {
-            // OK
-        }
-    }
-    
-    /**
-     * Verifies that JSONTokener can read a stream that contains a value. After
-     * the reading is done, check that the stream is left in the correct state
-     * by reading the characters after. All valid cases should reach end of stream.
-     * @param testStr
-     * @return
-     * @throws Exception
-     */
-    private Object nextValue(String testStr) throws JSONException {
-        StringReader sr = new StringReader(testStr);
-        try {
-            JSONTokener tokener = new JSONTokener(sr);
-    
-            Object result = tokener.nextValue();
-    
-            if( result == null ) {
-                throw new JSONException("Unable to find value token in JSON stream: ("+tokener+"): "+testStr);
-            }
-            
-            char c = tokener.nextClean();
-            if( 0 != c ) {
-                throw new JSONException("Unexpected character found at end of JSON stream: "+c+ " ("+tokener+"): "+testStr);
-            }
-    
-            return result;
-        } finally {
-            sr.close();
-        }
-
-    }
-    
-    /**
-     * Tests the failure of the skipTo method with a buffered reader. Preferably
-     * we'd like this not to fail but at this time we don't have a good recovery.
-     * 
-     * @throws IOException thrown if something unexpected happens.
-     */
-    @Test
-    public void testSkipToFailureWithBufferedReader() throws IOException {
-        final byte[] superLongBuffer = new byte[1000001];
-        // fill our buffer
-        for(int i=0;i keys = jsonObject.keys();
-        while (keys.hasNext()) {
-            String key = keys.next();
-            Object value = jsonObject.get(key);
-            Object expectedValue = expectedJsonObject.get(key);
-            compareActualVsExpectedObjects(value, expectedValue);
-        }
-    }
-
-    /**
-     * Compare two objects for equality. Might be JSONArray, JSONObject,
-     * or something else.
-     * @param value created by the code to be tested
-     * @param expectedValue created specifically for comparing
-     */
-    private static void compareActualVsExpectedObjects(Object value,
-            Object expectedValue) {
-        if (value instanceof JSONObject && expectedValue instanceof JSONObject) {
-            // Compare JSONObjects
-            JSONObject jsonObject = (JSONObject)value;
-            JSONObject expectedJsonObject = (JSONObject)expectedValue;
-            compareActualVsExpectedJsonObjects(
-                    jsonObject, expectedJsonObject);
-        } else if (value instanceof JSONArray && expectedValue instanceof JSONArray) {
-            // Compare JSONArrays
-            JSONArray jsonArray = (JSONArray)value;
-            JSONArray expectedJsonArray = (JSONArray)expectedValue;
-            compareActualVsExpectedJsonArrays(
-                    jsonArray, expectedJsonArray);
-        } else {
-            /**
-             * Compare all other types using toString(). First, the types must
-             * also be equal, unless both are Number type. Certain helper
-             * classes (e.g. XML) may create Long instead of Integer for small
-             * int values.
-             */
-            if (!(value instanceof Number && expectedValue instanceof Number)) {
-                // Non-Number and non-matching types
-                assertEquals("object types should be equal ",
-                    expectedValue.getClass().toString(),
-                    value.getClass().toString()
-                );
-            }
-            /**
-             * Same types or both Numbers, compare by toString()
-             */
-            assertEquals("values should be equal",
-                expectedValue.toString(),
-                value.toString()
-            );
-        }
-    }
-
-    /**
-     * Asserts that all JSONObject maps are the same as the default ctor
-     * @param jsonObjects list of objects to be tested
-     */
-    public static void checkJSONObjectsMaps(List jsonObjects) {
-        if (jsonObjects == null || jsonObjects.size() == 0) {
-            return;
-        }
-        Class mapType = new JSONObject().getMapType();
-        for (JSONObject jsonObject : jsonObjects) {
-            if (jsonObject != null) {
-                assertTrue(mapType == jsonObject.getMapType());
-                checkJSONObjectMaps(jsonObject, mapType);
-            }
-        }
-    }
-
-    /**
-     * Asserts that all JSONObject maps are the same as the default ctor
-     * @param jsonObject the object to be tested
-     */
-    public static void checkJSONObjectMaps(JSONObject jsonObject) {
-        if (jsonObject != null) {
-            checkJSONObjectMaps(jsonObject, jsonObject.getMapType());
-        }
-    }
-
-    /**
-     * Asserts that all JSONObject maps are the same as mapType
-     * @param jsonObject object to be tested
-     * @param mapType mapType to test against
-     */
-    public static void checkJSONObjectMaps(JSONObject jsonObject, Class mapType) {
-        if (mapType == null) {
-            mapType = new JSONObject().getMapType();
-        }
-        Set keys = jsonObject.keySet();
-        for (String key : keys) {
-            Object val = jsonObject.get(key);
-            if (val instanceof JSONObject) {
-                JSONObject jsonObjectVal = (JSONObject) val;
-                assertTrue(mapType == ((JSONObject) val).getMapType());
-                checkJSONObjectMaps(jsonObjectVal, mapType);
-            } else if (val instanceof JSONArray) {
-                JSONArray jsonArrayVal = (JSONArray)val;
-                checkJSONArrayMaps(jsonArrayVal, mapType);
-            }
-        }
-    }
-
-    /**
-     * Asserts that all JSONObject maps in the JSONArray object match the default map
-     * @param jsonArrays list of JSONArray objects to be tested
-     */
-    public static void checkJSONArraysMaps(List jsonArrays) {
-        if (jsonArrays == null || jsonArrays.size() == 0) {
-            return;
-        }
-        Class mapType = new JSONObject().getMapType();
-        for (JSONArray jsonArray : jsonArrays) {
-            if (jsonArray != null) {
-                checkJSONArrayMaps(jsonArray, mapType);
-            }
-        }
-    }
-
-    /**
-     * Asserts that all JSONObject maps in the JSONArray object match mapType
-     * @param jsonArray object to be tested
-     * @param mapType map type to be tested against
-     */
-    public static void checkJSONArrayMaps(JSONArray jsonArray, Class mapType) {
-        if (jsonArray == null) {
-            return;
-        }
-        if (mapType == null) {
-            mapType = new JSONObject().getMapType();
-        }
-        Iterator it = jsonArray.iterator();
-        while (it.hasNext()) {
-            Object val = it.next();
-            if (val instanceof JSONObject) {
-                JSONObject jsonObjectVal = (JSONObject)val;
-                checkJSONObjectMaps(jsonObjectVal, mapType);
-            } else if (val instanceof JSONArray) {
-                JSONArray jsonArrayVal = (JSONArray)val;
-                checkJSONArrayMaps(jsonArrayVal, mapType);
-            }
-        }
-    }
-
-    /**
-     * Asserts that all JSONObject maps nested in the JSONArray match
-     * the default mapType
-     * @param jsonArray the object to be tested
-     */
-    public static void checkJSONArrayMaps(JSONArray jsonArray) {
-        if (jsonArray != null) {
-            checkJSONArrayMaps(jsonArray, null);
-        }
-    }
-}
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
deleted file mode 100755
index 938c7c8..0000000
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ /dev/null
@@ -1,1236 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.XML;
-import org.json.XMLParserConfiguration;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import static org.junit.Assert.*;
-
-
-/**
- * Tests for JSON-Java XML.java with XMLParserConfiguration.java
- */
-public class XMLConfigurationTest {
-    /**
-     * JUnit supports temporary files and folders that are cleaned up after the test.
-     * https://garygregory.wordpress.com/2010/01/20/junit-tip-use-rules-to-manage-temporary-files-and-folders/ 
-     */
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-    /**
-     * JSONObject from a null XML string.
-     * Expects a NullPointerException
-     */
-    @Test(expected=NullPointerException.class)
-    public void shouldHandleNullXML() {
-        String xmlStr = null;
-        JSONObject jsonObject = 
-                XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-    }
-
-    /**
-     * Empty JSONObject from an empty XML string.
-     */
-    @Test
-    public void shouldHandleEmptyXML() {
-
-        String xmlStr = "";
-        JSONObject jsonObject = 
-                XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-    }
-
-    /**
-     * Empty JSONObject from a non-XML string.
-     */
-    @Test
-    public void shouldHandleNonXML() {
-        String xmlStr = "{ \"this is\": \"not xml\"}";
-        JSONObject jsonObject = 
-                XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-        assertTrue("xml string should be empty", jsonObject.isEmpty());
-    }
-
-    /**
-     * Invalid XML string (tag contains a frontslash).
-     * Expects a JSONException
-     */
-    @Test
-    public void shouldHandleInvalidSlashInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       abc street\n"+
-            "   
\n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misshaped tag at 176 [character 14 line 4]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string ('!' char in tag)
-     * Expects a JSONException
-     */
-    @Test
-    public void shouldHandleInvalidBangInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "   
\n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misshaped meta tag at 214 [character 12 line 7]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string ('!' char and no closing tag brace)
-     * Expects a JSONException
-     */
-    @Test
-    public void shouldHandleInvalidBangNoCloseInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misshaped meta tag at 213 [character 12 line 7]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string (no end brace for tag)
-     * Expects JSONException
-     */
-    @Test
-    public void shouldHandleNoCloseStartTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr, XMLParserConfiguration.KEEP_STRINGS);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misplaced '<' at 193 [character 4 line 6]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string (partial CDATA chars in tag name)
-     * Expects JSONException
-     */
-    @Test
-    public void shouldHandleInvalidCDATABangInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       Joe Tester\n"+
-            "       \n"+
-            "   
\n"+
-            "";
-        try {
-            XMLParserConfiguration config = 
-                    new XMLParserConfiguration().withcDataTagName("altContent");
-            XML.toJSONObject(xmlStr, config);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Expected 'CDATA[' at 204 [character 11 line 5]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Null JSONObject in XML.toString()
-     */
-    @Test
-    public void shouldHandleNullJSONXML() {
-        JSONObject jsonObject= null;
-        String actualXml = XML.toString(jsonObject, null,
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("generated XML does not equal expected XML","\"null\"",actualXml);
-    }
-
-    /**
-     * Empty JSONObject in XML.toString()
-     */
-    @Test
-    public void shouldHandleEmptyJSONXML() {
-        JSONObject jsonObject= new JSONObject();
-        String xmlStr = XML.toString(jsonObject, null,
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertTrue("xml string should be empty", xmlStr.isEmpty());
-    }
-
-    /**
-     * No SML start tag. The ending tag ends up being treated as content.
-     */
-    @Test
-    public void shouldHandleNoStartTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       >\n"+
-            "   
\n"+
-            "";
-        String expectedStr = 
-            "{\"addresses\":{\"address\":{\"name\":\"\",\"nocontent\":\"\",\""+
-            "content\":\">\"},\"xsi:noNamespaceSchemaLocation\":\"test.xsd\",\""+
-            "xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"}}";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr,
-                XMLParserConfiguration.KEEP_STRINGS);
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Valid XML to JSONObject
-     */
-    @Test
-    public void shouldHandleSimpleXML() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "   
\n"+
-            "       Joe Tester\n"+
-            "       [CDATA[Baker street 5]\n"+
-            "       \n"+
-            "       true\n"+
-            "       false\n"+
-            "       null\n"+
-            "       42\n"+
-            "       -23\n"+
-            "       -23.45\n"+
-            "       -23x.45\n"+
-            "       1, 2, 3, 4.1, 5.2\n"+
-            "   
\n"+
-            "";
-
-        String expectedStr = 
-            "{\"addresses\":{\"address\":{\"street\":\"[CDATA[Baker street 5]\","+
-            "\"name\":\"Joe Tester\",\"NothingHere\":\"\",\"TrueValue\":true,\n"+
-            "\"FalseValue\":false,\"NullValue\":null,\"PositiveValue\":42,\n"+
-            "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":\"-23x.45\",\n"+
-            "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+
-            "},\"xsi:noNamespaceSchemaLocation\":"+
-            "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+
-            "XMLSchema-instance\"}}";
-
-        XMLParserConfiguration config =
-                new XMLParserConfiguration().withcDataTagName("altContent");
-        compareStringToJSONObject(xmlStr, expectedStr, config);
-        compareReaderToJSONObject(xmlStr, expectedStr, config);
-        compareFileToJSONObject(xmlStr, expectedStr);
-    }
-
-    /**
-     * Valid XML with comments to JSONObject
-     */
-    @Test
-    public void shouldHandleCommentsInXML() {
-
-        String xmlStr = 
-                "\n"+
-                "\n"+
-                "\n"+
-                "   
\n"+
-                "        comment ]]>\n"+
-                "       Joe Tester\n"+
-                "       \n"+
-                "       Baker street 5\n"+
-                "   
\n"+
-                "";
-        XMLParserConfiguration config =
-                new XMLParserConfiguration().withcDataTagName("altContent");
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        String expectedStr = "{\"addresses\":{\"address\":{\"street\":\"Baker "+
-                "street 5\",\"name\":\"Joe Tester\",\"altContent\":\" this is -- "+
-                " comment \"}}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Valid XML to XML.toString()
-     */
-    @Test
-    public void shouldHandleToString() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "   
\n"+
-            "       [CDATA[Joe & T > e < s " t ' er]]\n"+
-            "       Baker street 5\n"+
-            "       1, 2, 3, 4.1, 5.2\n"+
-            "   
\n"+
-            "";
-
-        String expectedStr = 
-                "{\"addresses\":{\"address\":{\"street\":\"Baker street 5\","+
-                "\"name\":\"[CDATA[Joe & T > e < s \\\" t \\\' er]]\","+
-                "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+
-                "},\"xsi:noNamespaceSchemaLocation\":"+
-                "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+
-                "XMLSchema-instance\"}}";
-        
-        JSONObject jsonObject = XML.toJSONObject(xmlStr,
-                XMLParserConfiguration.KEEP_STRINGS);
-        String xmlToStr = XML.toString(jsonObject, null,
-                XMLParserConfiguration.KEEP_STRINGS);
-        JSONObject finalJsonObject = XML.toJSONObject(xmlToStr,
-                XMLParserConfiguration.KEEP_STRINGS);
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Converting a JSON doc containing '>' content to JSONObject, then
-     * XML.toString() should result in valid XML.
-     */
-    @Test
-    public void shouldHandleContentNoArraytoString() {
-        String expectedStr = 
-            "{\"addresses\":{\"altContent\":\">\"}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        XMLParserConfiguration config = new XMLParserConfiguration().withcDataTagName("altContent");
-        String finalStr = XML.toString(expectedJsonObject, null, config);
-        String expectedFinalStr = ">";
-        assertTrue("Should handle expectedFinal: ["+expectedStr+"] final: ["+
-                finalStr+"]", expectedFinalStr.equals(finalStr));
-    }
-
-    /**
-     * Converting a JSON doc containing a 'content' array to JSONObject, then
-     * XML.toString() should result in valid XML.
-     * TODO: This is probably an error in how the 'content' keyword is used.
-     */
-    @Test
-    public void shouldHandleContentArraytoString() {
-        String expectedStr = 
-            "{\"addresses\":{\"altContent\":[1, 2, 3]}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        XMLParserConfiguration config = new XMLParserConfiguration().withcDataTagName("altContent");
-        String finalStr = XML.toString(expectedJsonObject, null, config);
-        String expectedFinalStr = ""+
-                "1\n2\n3"+
-                "";
-        assertTrue("Should handle expectedFinal: ["+expectedStr+"] final: ["+
-                finalStr+"]", expectedFinalStr.equals(finalStr));
-    }
-
-    /**
-     * Converting a JSON doc containing a named array to JSONObject, then
-     * XML.toString() should result in valid XML.
-     */
-    @Test
-    public void shouldHandleArraytoString() {
-        String expectedStr = 
-                "{\"addresses\":{"+
-                        "\"something\":[1, 2, 3]}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        String finalStr = XML.toString(expectedJsonObject, null,
-                XMLParserConfiguration.KEEP_STRINGS);
-        String expectedFinalStr = ""+
-                "123"+
-                "";
-        assertTrue("Should handle expectedFinal: ["+expectedStr+"] final: ["+
-                finalStr+"]", expectedFinalStr.equals(finalStr));
-    }
-    
-    /**
-     * Tests that the XML output for empty arrays is consistent.
-     */
-    @Test
-    public void shouldHandleEmptyArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("array",new Object[]{});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("array",new JSONArray());
-
-        final String expected = "";
-        String output1 = XML.toString(jo1, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected an empty root tag", expected, output1);
-        String output2 = XML.toString(jo2, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected an empty root tag", expected, output2);
-    }
-    
-    /**
-     * Tests that the XML output for arrays is consistent when an internal array is empty.
-     */
-    @Test
-    public void shouldHandleEmptyMultiArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("arr",new Object[]{"One", new String[]{}, "Four"});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("arr",new JSONArray(new Object[]{"One", new JSONArray(new String[]{}), "Four"}));
-
-        final String expected = "OneFour";
-        String output1 = XML.toString(jo1, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected a matching array", expected, output1);
-        String output2 = XML.toString(jo2, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-
-        assertEquals("Expected a matching array", expected, output2);
-    }
-   
-    /**
-     * Tests that the XML output for arrays is consistent when arrays are not empty.
-     */
-    @Test
-    public void shouldHandleNonEmptyArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("arr",new String[]{"One", "Two", "Three"});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("arr",new JSONArray(new String[]{"One", "Two", "Three"}));
-
-        final String expected = "OneTwoThree";
-        String output1 = XML.toString(jo1, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected a non empty root tag", expected, output1);
-        String output2 = XML.toString(jo2, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected a non empty root tag", expected, output2);
-    }
-
-    /**
-     * Tests that the XML output for arrays is consistent when arrays are not empty and contain internal arrays.
-     */
-    @Test
-    public void shouldHandleMultiArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("arr",new Object[]{"One", new String[]{"Two", "Three"}, "Four"});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("arr",new JSONArray(new Object[]{"One", new JSONArray(new String[]{"Two", "Three"}), "Four"}));
-
-        final String expected = "OneTwoThreeFour";
-        String output1 = XML.toString(jo1, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected a matching array", expected, output1);
-        String output2 = XML.toString(jo2, "jo",
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals("Expected a matching array", expected, output2);
-    }
-
-    /**
-     * Converting a JSON doc containing a named array of nested arrays to
-     * JSONObject, then XML.toString() should result in valid XML.
-     */
-    @Test
-    public void shouldHandleNestedArraytoString() {
-        String xmlStr = 
-            "{\"addresses\":{\"address\":{\"name\":\"\",\"nocontent\":\"\","+
-            "\"outer\":[[1], [2], [3]]},\"xsi:noNamespaceSchemaLocation\":\"test.xsd\",\""+
-            "xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"}}";
-        JSONObject jsonObject = new JSONObject(xmlStr);
-        String finalStr = XML.toString(jsonObject, null,
-                XMLParserConfiguration.ORIGINAL);
-        JSONObject finalJsonObject = XML.toJSONObject(finalStr);
-        String expectedStr = "
"+
-                "12"+
-                "3"+
-                "
test.xsdhttp://www.w3.org/2001/XMLSche"+
-                "ma-instance";
-        JSONObject expectedJsonObject = XML.toJSONObject(expectedStr, 
-                XMLParserConfiguration.ORIGINAL);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-
-
-    /**
-     * Possible bug: 
-     * Illegal node-names must be converted to legal XML-node-names.
-     * The given example shows 2 nodes which are valid for JSON, but not for XML.
-     * Therefore illegal arguments should be converted to e.g. an underscore (_).
-     */
-    @Test
-    public void shouldHandleIllegalJSONNodeNames()
-    {
-        JSONObject inputJSON = new JSONObject();
-        inputJSON.append("123IllegalNode", "someValue1");
-        inputJSON.append("Illegal@node", "someValue2");
-
-        String result = XML.toString(inputJSON, null,
-                XMLParserConfiguration.KEEP_STRINGS);
-
-        /*
-         * This is invalid XML. Names should not begin with digits or contain
-         * certain values, including '@'. One possible solution is to replace
-         * illegal chars with '_', in which case the expected output would be:
-         * <___IllegalNode>someValue1someValue2
-         */
-        String expected = "<123IllegalNode>someValue1someValue2";
-
-        assertEquals("Length", expected.length(), result.length());
-        assertTrue("123IllegalNode", result.contains("<123IllegalNode>someValue1"));
-        assertTrue("Illegal@node", result.contains("someValue2"));
-    }
-
-    /**
-     * JSONObject with NULL value, to XML.toString()
-     */
-    @Test
-    public void shouldHandleNullNodeValue()
-    {
-        JSONObject inputJSON = new JSONObject();
-        inputJSON.put("nullValue", JSONObject.NULL);
-        // This is a possible preferred result
-        // String expectedXML = "";
-        /**
-         * This is the current behavior. JSONObject.NULL is emitted as 
-         * the string, "null".
-         */
-        String actualXML = "null";
-        String resultXML = XML.toString(inputJSON, null,
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertEquals(actualXML, resultXML);
-    }
-
-    @Test
-    public void shouldHandleEmptyNodeValue()
-    {
-        JSONObject inputJSON = new JSONObject();
-        inputJSON.put("Emptyness", "");
-        String expectedXmlWithoutExplicitEndTag = "";
-        String expectedXmlWithExplicitEndTag = "";
-        assertEquals(expectedXmlWithoutExplicitEndTag, XML.toString(inputJSON, null,
-                new XMLParserConfiguration().withCloseEmptyTag(false)));
-        assertEquals(expectedXmlWithExplicitEndTag, XML.toString(inputJSON, null,
-                new XMLParserConfiguration().withCloseEmptyTag(true)));
-    }
-
-    @Test
-    public void shouldKeepConfigurationIntactAndUpdateCloseEmptyTagChoice()
-    {
-        XMLParserConfiguration keepStrings = XMLParserConfiguration.KEEP_STRINGS;
-        XMLParserConfiguration keepStringsAndCloseEmptyTag = keepStrings.withCloseEmptyTag(true);
-        XMLParserConfiguration keepDigits = keepStringsAndCloseEmptyTag.withKeepStrings(false);
-        XMLParserConfiguration keepDigitsAndNoCloseEmptyTag = keepDigits.withCloseEmptyTag(false);
-        assertTrue(keepStrings.isKeepNumberAsString());
-        assertTrue(keepStrings.isKeepBooleanAsString());
-        assertFalse(keepStrings.isCloseEmptyTag());
-        assertTrue(keepStringsAndCloseEmptyTag.isKeepNumberAsString());
-        assertTrue(keepStringsAndCloseEmptyTag.isKeepBooleanAsString());
-        assertTrue(keepStringsAndCloseEmptyTag.isCloseEmptyTag());
-        assertFalse(keepDigits.isKeepNumberAsString());
-        assertFalse(keepDigits.isKeepBooleanAsString());
-        assertTrue(keepDigits.isCloseEmptyTag());
-        assertFalse(keepDigitsAndNoCloseEmptyTag.isKeepNumberAsString());
-        assertFalse(keepDigitsAndNoCloseEmptyTag.isKeepBooleanAsString());
-        assertFalse(keepDigitsAndNoCloseEmptyTag.isCloseEmptyTag());
-    }
-
-    /**
-     * Investigate exactly how the "content" keyword works
-     */
-    @Test
-    public void contentOperations() {
-        /*
-         * When a standalone  0) then return]]>";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, 
-                XMLParserConfiguration.KEEP_STRINGS);
-        assertTrue("1. 3 items", 3 == jsonObject.length());
-        assertTrue("1. empty tag1", "".equals(jsonObject.get("tag1")));
-        assertTrue("1. empty tag2", "".equals(jsonObject.get("tag2")));
-        assertTrue("1. content found", "if (a < b && a > 0) then return".equals(jsonObject.get("content")));
-
-        // multiple consecutive standalone cdatas are accumulated into an array
-        xmlStr = " 0) then return]]>";
-        jsonObject = XML.toJSONObject(xmlStr,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        assertTrue("2. 3 items", 3 == jsonObject.length());
-        assertTrue("2. empty tag1", "".equals(jsonObject.get("tag1")));
-        assertTrue("2. empty tag2", "".equals(jsonObject.get("tag2")));
-        assertTrue("2. content array found", jsonObject.get("altContent") instanceof JSONArray);
-        JSONArray jsonArray = jsonObject.getJSONArray("altContent");
-        assertTrue("2. array size", jsonArray.length() == 2);
-        assertTrue("2. content array entry 0", "if (a < b && a > 0) then return".equals(jsonArray.get(0)));
-        assertTrue("2. content array entry 1", "here is another cdata".equals(jsonArray.get(1)));
-
-        /*
-         * text content is accumulated in a "content" inside a local JSONObject.
-         * If there is only one instance, it is saved in the context (a different JSONObject 
-         * from the calling code. and the content element is discarded. 
-         */
-        xmlStr =  "value 1";
-        jsonObject = XML.toJSONObject(xmlStr,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        assertTrue("3. 2 items", 1 == jsonObject.length());
-        assertTrue("3. value tag1", "value 1".equals(jsonObject.get("tag1")));
-
-        /*
-         * array-style text content (multiple tags with the same name) is 
-         * accumulated in a local JSONObject with key="content" and value=JSONArray,
-         * saved in the context, and then the local JSONObject is discarded.
-         */
-        xmlStr =  "value 12true";
-        jsonObject = XML.toJSONObject(xmlStr,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        assertTrue("4. 1 item", 1 == jsonObject.length());
-        assertTrue("4. content array found", jsonObject.get("tag1") instanceof JSONArray);
-        jsonArray = jsonObject.getJSONArray("tag1");
-        assertTrue("4. array size", jsonArray.length() == 3);
-        assertTrue("4. content array entry 0", "value 1".equals(jsonArray.get(0)));
-        assertTrue("4. content array entry 1", jsonArray.getInt(1) == 2);
-        assertTrue("4. content array entry 2", jsonArray.getBoolean(2) == true);
-
-        /*
-         * Complex content is accumulated in a "content" field. For example, an element
-         * may contain a mix of child elements and text. Each text segment is 
-         * accumulated to content. 
-         */
-        xmlStr =  "val1val2";
-        jsonObject = XML.toJSONObject(xmlStr,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        assertTrue("5. 1 item", 1 == jsonObject.length());
-        assertTrue("5. jsonObject found", jsonObject.get("tag1") 
-                instanceof JSONObject);
-        jsonObject = jsonObject.getJSONObject("tag1");
-        assertTrue("5. 2 contained items", 2 == jsonObject.length());
-        assertTrue("5. contained tag", "".equals(jsonObject.get("tag2")));
-        assertTrue("5. contained content jsonArray found",
-                jsonObject.get("altContent") instanceof JSONArray);
-        jsonArray = jsonObject.getJSONArray("altContent");
-        assertTrue("5. array size", jsonArray.length() == 2);
-        assertTrue("5. content array entry 0", "val1".equals(jsonArray.get(0)));
-        assertTrue("5. content array entry 1", "val2".equals(jsonArray.get(1)));
-
-        /*
-         * If there is only 1 complex text content, then it is accumulated in a 
-         * "content" field as a string.
-         */
-        xmlStr =  "val1";
-        jsonObject = XML.toJSONObject(xmlStr,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        assertTrue("6. 1 item", 1 == jsonObject.length());
-        assertTrue("6. jsonObject found", jsonObject.get("tag1") instanceof JSONObject);
-        jsonObject = jsonObject.getJSONObject("tag1");
-        assertTrue("6. contained content found", 
-                "val1".equals(jsonObject.get("altContent")));
-        assertTrue("6. contained tag2", "".equals(jsonObject.get("tag2")));
-
-        /*
-         * In this corner case, the content sibling happens to have key=content
-         * We end up with an array within an array, and no content element.
-         * This is probably a bug. 
-         */
-        xmlStr =  "val1";
-        jsonObject = XML.toJSONObject(xmlStr,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        assertTrue("7. 1 item", 1 == jsonObject.length());
-        assertTrue("7. jsonArray found", 
-                jsonObject.get("tag1") instanceof JSONArray);
-        jsonArray = jsonObject.getJSONArray("tag1");
-        assertTrue("array size 1", jsonArray.length() == 1);
-        assertTrue("7. contained array found", jsonArray.get(0) 
-                instanceof JSONArray);
-        jsonArray = jsonArray.getJSONArray(0);
-        assertTrue("7. inner array size 2", jsonArray.length() == 2);
-        assertTrue("7. inner array item 0", "val1".equals(jsonArray.get(0)));
-        assertTrue("7. inner array item 1", "".equals(jsonArray.get(1)));
-
-        /*
-         * Confirm behavior of original issue
-         */
-        String jsonStr = 
-                "{"+
-                    "\"Profile\": {"+
-                        "\"list\": {"+
-                            "\"history\": {"+
-                                "\"entries\": ["+
-                                    "{"+
-                                        "\"deviceId\": \"id\","+
-                                        "\"altContent\": {"+
-                                            "\"material\": ["+
-                                                "{"+
-                                                    "\"stuff\": false"+
-                                                "}"+
-                                            "]"+
-                                        "}"+
-                                    "}"+
-                                "]"+
-                            "}"+
-                        "}"+
-                    "}"+
-                "}";
-        jsonObject = new JSONObject(jsonStr);
-        xmlStr = XML.toString(jsonObject, null,
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent"));
-        /*
-         * This is the created XML. Looks like content was mistaken for
-         * complex (child node + text) XML. 
-         *  
-         *      
-         *          
-         *              
-         *                  id
-         *                  {"material":[{"stuff":false}]}
-         *              
-         *          
-         *      
-         *  
-         */
-        assertTrue("nothing to test here, see comment on created XML, above", true);
-    }
-
-    /**
-     * JSON string lost leading zero and converted "True" to true.
-     */
-    @Test
-    public void testToJSONArray_jsonOutput() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
-        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, 
-                new XMLParserConfiguration().withKeepStrings(false));
-        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
-    }
-
-    /**
-     * JSON string lost leading zero and converted "True" to true.
-     */
-    @Test
-    public void testToJSONArray_jsonOutput_withKeepNumberAsString() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":true}}");
-        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
-                new XMLParserConfiguration().withKeepNumberAsString(true));
-        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
-    }
-
-    /**
-     * JSON string lost leading zero and converted "True" to true.
-     */
-    @Test
-    public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":\"True\"}}");
-        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
-                new XMLParserConfiguration().withKeepBooleanAsString(true));
-        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
-    }
-
-    /**
-     * Test keepStrings behavior when setting keepBooleanAsString, keepNumberAsString
-     */
-    @Test
-    public void test_keepStringBehavior() {
-        XMLParserConfiguration xpc = new XMLParserConfiguration().withKeepStrings(true);
-        assertEquals(xpc.isKeepStrings(), true);
-
-        xpc = xpc.withKeepBooleanAsString(true);
-        xpc = xpc.withKeepNumberAsString(false);
-        assertEquals(xpc.isKeepStrings(), false);
-
-        xpc = xpc.withKeepBooleanAsString(false);
-        xpc = xpc.withKeepNumberAsString(true);
-        assertEquals(xpc.isKeepStrings(), false);
-
-        xpc = xpc.withKeepBooleanAsString(true);
-        xpc = xpc.withKeepNumberAsString(true);
-        assertEquals(xpc.isKeepStrings(), true);
-
-        xpc = xpc.withKeepBooleanAsString(false);
-        xpc = xpc.withKeepNumberAsString(false);
-        assertEquals(xpc.isKeepStrings(), false);
-    }
-
-    /**
-     * JSON string cannot be reverted to original xml.
-     */
-    @Test
-    public void testToJSONArray_reversibility() {
-        final String originalXml = "011000True";
-        XMLParserConfiguration config = new XMLParserConfiguration().withKeepStrings(false);
-        final String revertedXml = 
-                XML.toString(XML.toJSONObject(originalXml, config), 
-                        null, config);
-        assertNotEquals(revertedXml, originalXml);
-    }
-
-    /**
-     * test passes when using the new method toJsonArray.
-     */
-    @Test
-    public void testToJsonXML() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":\"True\"}}");
-
-        final JSONObject json = XML.toJSONObject(originalXml,
-                new XMLParserConfiguration().withKeepStrings(true));
-        Util.compareActualVsExpectedJsonObjects(json, expected);
-        
-        final String reverseXml = XML.toString(json);
-        // this reversal isn't exactly the same. use JSONML for an exact reversal
-        final String expectedReverseXml = "01011000True";
-
-        assertEquals("length",expectedReverseXml.length(), reverseXml.length());
-        assertTrue("array contents", reverseXml.contains("011000"));
-        assertTrue("item contents", reverseXml.contains("01"));
-        assertTrue("title contents", reverseXml.contains("True"));
-    }
-    
-    /**
-     * test to validate certain conditions of XML unescaping.
-     */
-    @Test
-    public void testUnescape() {
-        assertEquals("{\"xml\":\"Can cope <;\"}",
-                XML.toJSONObject("Can cope <; ",
-                        XMLParserConfiguration.KEEP_STRINGS).toString());
-        assertEquals("Can cope <; ", XML.unescape("Can cope <; "));
-
-        assertEquals("{\"xml\":\"Can cope & ;\"}",
-                XML.toJSONObject("Can cope & ; ",
-                        XMLParserConfiguration.KEEP_STRINGS).toString());
-        assertEquals("Can cope & ; ", XML.unescape("Can cope & ; "));
-
-        assertEquals("{\"xml\":\"Can cope &;\"}",
-                XML.toJSONObject("Can cope &; ",
-                        XMLParserConfiguration.KEEP_STRINGS).toString());
-        assertEquals("Can cope &; ", XML.unescape("Can cope &; "));
-
-        // unicode entity
-        assertEquals("{\"xml\":\"Can cope 4;\"}",
-                XML.toJSONObject("Can cope 4; ",
-                        XMLParserConfiguration.KEEP_STRINGS).toString());
-        assertEquals("Can cope 4; ", XML.unescape("Can cope 4; "));
-
-        // double escaped
-        assertEquals("{\"xml\":\"Can cope <\"}",
-                XML.toJSONObject("Can cope &lt; ",
-                        XMLParserConfiguration.KEEP_STRINGS).toString());
-        assertEquals("Can cope < ", XML.unescape("Can cope &lt; "));
-        
-        assertEquals("{\"xml\":\"Can cope 4\"}",
-                XML.toJSONObject("Can cope &#x34; ",
-                        XMLParserConfiguration.KEEP_STRINGS).toString());
-        assertEquals("Can cope 4 ", XML.unescape("Can cope &#x34; "));
-
-   }
-
-    /**
-     * Confirm XMLParserConfiguration functionality
-     */
-    @Test
-    public void testConfig() {
-        /**
-         * 1st param is whether to keep the raw string, or call
-         * XML.stringToValue(), which may convert the token to
-         * boolean, null, or number.
-         * 2nd param is what JSON name to use for strings that are
-         * evaluated as xml content data in complex objects, e.g. 
-         * 
-         *      value
-         *      content data
-         * 
-         */
-
-        String xmlStr = 
-                "\n"+
-                "\n"+
-                "   
\n"+
-                "       content 1\n"+
-                "       Sherlock Holmes\n"+
-                "       content 2\n"+
-                "       Baker street 5\n"+
-                "       content 3\n"+
-                "       1\n"+
-                "   
\n"+
-                "";
-
-        // keep strings, use the altContent tag
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withKeepStrings(true)
-                        .withcDataTagName("altContent");
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        // num is parsed as a string
-        assertEquals(jsonObject.getJSONObject("addresses").
-                getJSONObject("address").getString("num"), "1");
-        // complex content is collected in an 'altContent' array
-        JSONArray jsonArray = jsonObject.getJSONObject("addresses").
-                getJSONObject("address").getJSONArray("altContent");
-        String expectedStr = "[\"content 1\", \"content 2\", \"content 3\"]";
-        JSONArray expectedJsonArray = new JSONArray(expectedStr);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-
-        // keepstrings only
-        jsonObject = XML.toJSONObject(xmlStr, 
-                XMLParserConfiguration.KEEP_STRINGS);
-        // num is parsed as a string
-        assertEquals(jsonObject.getJSONObject("addresses").
-                getJSONObject("address").getString("num"), "1");
-        // complex content is collected in an 'content' array
-        jsonArray = jsonObject.getJSONObject("addresses").
-                getJSONObject("address").getJSONArray("content");
-        expectedJsonArray = new JSONArray(expectedStr);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-        
-        // use alternate content name
-        config = new XMLParserConfiguration().withcDataTagName("altContent");
-        jsonObject = XML.toJSONObject(xmlStr, config);
-        // num is parsed as a number
-        assertEquals(jsonObject.getJSONObject("addresses").
-                getJSONObject("address").getInt("num"), 1);
-        // complex content is collected in an 'altContent' array
-        jsonArray = jsonObject.getJSONObject("addresses").
-                getJSONObject("address").getJSONArray("altContent");
-        expectedJsonArray = new JSONArray(expectedStr);
-        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
-
-    }
-
-    /**
-     * Test forceList parameter
-     */
-    @Test
-    public void testSimpleForceList() {
-        String xmlStr = 
-                "\n"+
-                "\n"+
-                "   
\n"+
-                "      Sherlock Holmes\n"+
-                "   
\n"+
-                "";
-
-        String expectedStr = 
-                "{\"addresses\":[{\"address\":{\"name\":\"Sherlock Holmes\"}}]}";
-        
-        Set forceList = new HashSet();
-        forceList.add("addresses");
-
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withForceList(forceList);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        JSONObject expetedJsonObject = new JSONObject(expectedStr);
-
-        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
-    }
-    @Test
-    public void testLongForceList() {
-        String xmlStr = 
-                ""+
-                    ""+
-                        "host1"+
-                        "Linux"+
-                        ""+
-                            ""+
-                                "em0"+
-                                "10.0.0.1"+
-                            ""+
-                        ""+
-                    ""+
-                "";
-
-        String expectedStr = 
-                "{"+
-                    "\"servers\": ["+
-                        "{"+
-                            "\"server\": {"+
-                            "\"name\": \"host1\","+
-                            "\"os\": \"Linux\","+
-                            "\"interfaces\": ["+
-                                "{"+
-                                    "\"interface\": {"+
-                                    "\"name\": \"em0\","+
-                                    "\"ip_address\": \"10.0.0.1\""+
-                                    "}}]}}]}";
-        
-        Set forceList = new HashSet();
-        forceList.add("servers");
-        forceList.add("interfaces");
-
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withForceList(forceList);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        JSONObject expetedJsonObject = new JSONObject(expectedStr);
-
-        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
-    }
-    @Test
-    public void testMultipleTagForceList() {
-        String xmlStr = 
-                "\n"+
-                "   
\n"+
-                "      Sherlock Holmes\n"+
-                "      John H. Watson\n"+
-                "   
\n"+
-                "";
-
-        String expectedStr = 
-                "{"+
-                    "\"addresses\":["+
-                    "{"+
-                        "\"address\":["+
-                            "{"+
-                                "\"name\":["+
-                                "\"Sherlock Holmes\","+
-                                "\"John H. Watson\""+
-                                "]"+
-                            "}"+
-                        "]"+
-                    "}"+
-                    "]"+
-                "}";
-        
-        Set forceList = new HashSet();
-        forceList.add("addresses");
-        forceList.add("address");
-        forceList.add("name");
-
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withForceList(forceList);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        JSONObject expetedJsonObject = new JSONObject(expectedStr);
-
-        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
-    }
-    @Test
-    public void testEmptyForceList() {
-        String xmlStr = 
-                "";
-
-        String expectedStr = 
-                "{\"addresses\":[]}";
-        
-        Set forceList = new HashSet();
-        forceList.add("addresses");
-
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withForceList(forceList);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        JSONObject expetedJsonObject = new JSONObject(expectedStr);
-
-        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
-    }
-    @Test
-    public void testContentForceList() {
-        String xmlStr = 
-                "Baker Street";
-
-        String expectedStr = 
-                "{\"addresses\":[\"Baker Street\"]}";
-        
-        Set forceList = new HashSet();
-        forceList.add("addresses");
-
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withForceList(forceList);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        JSONObject expetedJsonObject = new JSONObject(expectedStr);
-
-        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
-    }
-    @Test
-    public void testEmptyTagForceList() {
-        String xmlStr = 
-                "";
-
-        String expectedStr = 
-                "{\"addresses\":[]}";
-        
-        Set forceList = new HashSet();
-        forceList.add("addresses");
-
-        XMLParserConfiguration config = 
-                new XMLParserConfiguration()
-                        .withForceList(forceList);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        JSONObject expetedJsonObject = new JSONObject(expectedStr);
-
-        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
-    }
-
-    @Test
-    public void testMaxNestingDepthIsSet() {
-        XMLParserConfiguration xmlParserConfiguration = XMLParserConfiguration.ORIGINAL;
-
-        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
-
-        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(42);
-
-        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), 42);
-
-        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(0);
-
-        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), 0);
-
-        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(-31415926);
-
-        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH);
-
-        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(Integer.MIN_VALUE);
-
-        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH);
-    }
-    
-    /**
-     * Convenience method, given an input string and expected result,
-     * convert to JSONObject and compare actual to expected result.
-     * @param xmlStr the string to parse
-     * @param expectedStr the expected JSON string
-     * @param config provides more flexible XML parsing
-     * flexible XML parsing.
-     */
-    private void compareStringToJSONObject(String xmlStr, String expectedStr,
-            XMLParserConfiguration config) {
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Convenience method, given an input string and expected result,
-     * convert to JSONObject via reader and compare actual to expected result.
-     * @param xmlStr the string to parse
-     * @param expectedStr the expected JSON string
-     * @param config provides more flexible XML parsing
-     */
-    private void compareReaderToJSONObject(String xmlStr, String expectedStr,
-            XMLParserConfiguration config) {
-        /*
-         * Commenting out this method until the JSON-java code is updated
-         * to support XML.toJSONObject(reader)
-         */
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Reader reader = new StringReader(xmlStr);
-        try {
-            JSONObject jsonObject = XML.toJSONObject(reader, config);
-            Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-        } catch (Exception e) {
-            assertTrue("Reader error: " +e.getMessage(), false);
-        } finally {
-            try {
-                reader.close();
-            } catch (Exception e) {}
-        }
-    }
-
-    /**
-     * Convenience method, given an input string and expected result, convert to
-     * JSONObject via file and compare actual to expected result.
-     * 
-     * @param xmlStr
-     *            the string to parse
-     * @param expectedStr
-     *            the expected JSON string
-     * @throws IOException
-     */
-    private void compareFileToJSONObject(String xmlStr, String expectedStr) {
-        /*
-         * Commenting out this method until the JSON-java code is updated
-         * to support XML.toJSONObject(reader)
-         */
-        try {
-            JSONObject expectedJsonObject = new JSONObject(expectedStr);
-            File tempFile = this.testFolder.newFile("fileToJSONObject.xml");
-            FileWriter fileWriter = new FileWriter(tempFile);
-            try {
-                fileWriter.write(xmlStr);
-            } finally {
-                fileWriter.close();
-            }
-
-            Reader reader = new FileReader(tempFile);
-            try {
-                JSONObject jsonObject = XML.toJSONObject(reader);
-                Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-            } finally {
-                reader.close();
-            }
-        } catch (IOException e) {
-            assertTrue("Error: " +e.getMessage(), false);
-        }
-    }
-}
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
deleted file mode 100644
index 2fa5dae..0000000
--- a/src/test/java/org/json/junit/XMLTest.java
+++ /dev/null
@@ -1,1432 +0,0 @@
-package org.json.junit;
-
-/*
-Public Domain.
-*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.json.*;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-
-/**
- * Tests for JSON-Java XML.java
- * Note: noSpace() will be tested by JSONMLTest
- */
-public class XMLTest {
-    /**
-     * JUnit supports temporary files and folders that are cleaned up after the test.
-     * https://garygregory.wordpress.com/2010/01/20/junit-tip-use-rules-to-manage-temporary-files-and-folders/ 
-     */
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-    
-    /**
-     * JSONObject from a null XML string.
-     * Expects a NullPointerException
-     */
-    @Test(expected=NullPointerException.class)
-    public void shouldHandleNullXML() {
-        String xmlStr = null;
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-    }
-
-    /**
-     * Empty JSONObject from an empty XML string.
-     */
-    @Test
-    public void shouldHandleEmptyXML() {
-
-        String xmlStr = "";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("jsonObject should be empty", jsonObject.isEmpty());
-    }
-
-    /**
-     * Empty JSONObject from a non-XML string.
-     */
-    @Test
-    public void shouldHandleNonXML() {
-        String xmlStr = "{ \"this is\": \"not xml\"}";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("xml string should be empty", jsonObject.isEmpty());
-    }
-
-    /**
-     * Invalid XML string (tag contains a frontslash).
-     * Expects a JSONException
-     */
-    @Test
-    public void shouldHandleInvalidSlashInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       abc street\n"+
-            "   
\n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misshaped tag at 176 [character 14 line 4]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string ('!' char in tag)
-     * Expects a JSONException
-     */
-    @Test
-    public void shouldHandleInvalidBangInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "   
\n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misshaped meta tag at 214 [character 12 line 7]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string ('!' char and no closing tag brace)
-     * Expects a JSONException
-     */
-    @Test
-    public void shouldHandleInvalidBangNoCloseInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misshaped meta tag at 213 [character 12 line 7]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string (no end brace for tag)
-     * Expects JSONException
-     */
-    @Test
-    public void shouldHandleNoCloseStartTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       \n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Misplaced '<' at 193 [character 4 line 6]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Invalid XML string (partial CDATA chars in tag name)
-     * Expects JSONException
-     */
-    @Test
-    public void shouldHandleInvalidCDATABangInTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       Joe Tester\n"+
-            "       \n"+
-            "   
\n"+
-            "";
-        try {
-            XML.toJSONObject(xmlStr);
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "Expected 'CDATA[' at 204 [character 11 line 5]",
-                    e.getMessage());
-        }
-    }
-
-    /**
-     * Null JSONObject in XML.toString()
-     */
-    @Test
-    public void shouldHandleNullJSONXML() {
-        JSONObject jsonObject= null;
-        String actualXml=XML.toString(jsonObject);
-        assertEquals("generated XML does not equal expected XML","\"null\"",actualXml);
-    }
-
-    /**
-     * Empty JSONObject in XML.toString()
-     */
-    @Test
-    public void shouldHandleEmptyJSONXML() {
-        JSONObject jsonObject= new JSONObject();
-        String xmlStr = XML.toString(jsonObject);
-        assertTrue("xml string should be empty", xmlStr.isEmpty());
-    }
-
-    /**
-     * No SML start tag. The ending tag ends up being treated as content.
-     */
-    @Test
-    public void shouldHandleNoStartTag() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "    
\n"+
-            "       \n"+
-            "       >\n"+
-            "   
\n"+
-            "";
-        String expectedStr = 
-            "{\"addresses\":{\"address\":{\"name\":\"\",\"nocontent\":\"\",\""+
-            "content\":\">\"},\"xsi:noNamespaceSchemaLocation\":\"test.xsd\",\""+
-            "xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"}}";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Valid XML to JSONObject
-     */
-    @Test
-    public void shouldHandleSimpleXML() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "   
\n"+
-            "       Joe Tester\n"+
-            "       [CDATA[Baker street 5]\n"+
-            "       \n"+
-            "       true\n"+
-            "       false\n"+
-            "       null\n"+
-            "       42\n"+
-            "       -23\n"+
-            "       -23.45\n"+
-            "       -23x.45\n"+
-            "       1, 2, 3, 4.1, 5.2\n"+
-            "   
\n"+
-            "";
-
-        String expectedStr = 
-            "{\"addresses\":{\"address\":{\"street\":\"[CDATA[Baker street 5]\","+
-            "\"name\":\"Joe Tester\",\"NothingHere\":\"\",\"TrueValue\":true,\n"+
-            "\"FalseValue\":false,\"NullValue\":null,\"PositiveValue\":42,\n"+
-            "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":\"-23x.45\",\n"+
-            "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+
-            "},\"xsi:noNamespaceSchemaLocation\":"+
-            "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+
-            "XMLSchema-instance\"}}";
-
-        compareStringToJSONObject(xmlStr, expectedStr);
-        compareReaderToJSONObject(xmlStr, expectedStr);
-        compareFileToJSONObject(xmlStr, expectedStr);
-    }
-
-    /**
-     * Tests to verify that supported escapes in XML are converted to actual values.
-     */
-    @Test
-    public void testXmlEscapeToJson(){
-        String xmlStr = 
-            "\n"+
-            ""+
-            "\""+
-            "A €33"+
-            "A €22€"+
-            "some text ©"+
-            "" " & ' < >"+
-            "𝄢 𐅥" +
-            "";
-        String expectedStr = 
-            "{\"root\":{" +
-            "\"rawQuote\":\"\\\"\"," +
-            "\"euro\":\"A €33\"," +
-            "\"euroX\":\"A €22€\"," +
-            "\"unknown\":\"some text ©\"," +
-            "\"known\":\"\\\" \\\" & ' < >\"," +
-            "\"high\":\"𝄢 𐅥\""+
-            "}}";
-        
-        compareStringToJSONObject(xmlStr, expectedStr);
-        compareReaderToJSONObject(xmlStr, expectedStr);
-        compareFileToJSONObject(xmlStr, expectedStr);
-    }
-    
-    /**
-     * Tests that control characters are escaped.
-     */
-    @Test
-    public void testJsonToXmlEscape(){
-        final String jsonSrc = "{\"amount\":\"10,00 €\","
-                + "\"description\":\"Ação Válida\u0085\","
-                + "\"xmlEntities\":\"\\\" ' & < >\""
-                + "}";
-        JSONObject json = new JSONObject(jsonSrc);
-        String xml = XML.toString(json);
-        //test control character not existing
-        assertFalse("Escaping \u0085 failed. Found in XML output.", xml.contains("\u0085"));
-        assertTrue("Escaping \u0085 failed. Entity not found in XML output.", xml.contains("…"));
-        // test normal unicode existing
-        assertTrue("Escaping € failed. Not found in XML output.", xml.contains("€"));
-        assertTrue("Escaping ç failed. Not found in XML output.", xml.contains("ç"));
-        assertTrue("Escaping ã failed. Not found in XML output.", xml.contains("ã"));
-        assertTrue("Escaping á failed. Not found in XML output.", xml.contains("á"));
-        // test XML Entities converted
-        assertTrue("Escaping \" failed. Not found in XML output.", xml.contains("""));
-        assertTrue("Escaping ' failed. Not found in XML output.", xml.contains("'"));
-        assertTrue("Escaping & failed. Not found in XML output.", xml.contains("&"));
-        assertTrue("Escaping < failed. Not found in XML output.", xml.contains("<"));
-        assertTrue("Escaping > failed. Not found in XML output.", xml.contains(">"));
-    }
-
-    /**
-     * Valid XML with comments to JSONObject
-     */
-    @Test
-    public void shouldHandleCommentsInXML() {
-
-        String xmlStr = 
-                "\n"+
-                "\n"+
-                "\n"+
-                "   
\n"+
-                "        comment ]]>\n"+
-                "       Joe Tester\n"+
-                "       \n"+
-                "       Baker street 5\n"+
-                "   
\n"+
-                "";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        String expectedStr = "{\"addresses\":{\"address\":{\"street\":\"Baker "+
-                "street 5\",\"name\":\"Joe Tester\",\"content\":\" this is -- "+
-                " comment \"}}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Valid XML to XML.toString()
-     */
-    @Test
-    public void shouldHandleToString() {
-        String xmlStr = 
-            "\n"+
-            "\n"+
-            "   
\n"+
-            "       [CDATA[Joe & T > e < s " t ' er]]\n"+
-            "       Baker street 5\n"+
-            "       1, 2, 3, 4.1, 5.2\n"+
-            "   
\n"+
-            "";
-
-        String expectedStr = 
-                "{\"addresses\":{\"address\":{\"street\":\"Baker street 5\","+
-                "\"name\":\"[CDATA[Joe & T > e < s \\\" t \\\' er]]\","+
-                "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+
-                "},\"xsi:noNamespaceSchemaLocation\":"+
-                "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+
-                "XMLSchema-instance\"}}";
-        
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        String xmlToStr = XML.toString(jsonObject);
-        JSONObject finalJsonObject = XML.toJSONObject(xmlToStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Converting a JSON doc containing '>' content to JSONObject, then
-     * XML.toString() should result in valid XML.
-     */
-    @Test
-    public void shouldHandleContentNoArraytoString() {
-        String expectedStr = "{\"addresses\":{\"content\":\">\"}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        String finalStr = XML.toString(expectedJsonObject);
-        String expectedFinalStr = ">";
-        assertEquals("Should handle expectedFinal: ["+expectedStr+"] final: ["+
-                finalStr+"]", expectedFinalStr, finalStr);
-    }
-
-    /**
-     * Converting a JSON doc containing a 'content' array to JSONObject, then
-     * XML.toString() should result in valid XML.
-     * TODO: This is probably an error in how the 'content' keyword is used.
-     */
-    @Test
-    public void shouldHandleContentArraytoString() {
-        String expectedStr = 
-            "{\"addresses\":{" +
-            "\"content\":[1, 2, 3]}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        String finalStr = XML.toString(expectedJsonObject);
-        String expectedFinalStr = ""+
-                "1\n2\n3";
-        assertEquals("Should handle expectedFinal: ["+expectedStr+"] final: ["+
-                finalStr+"]", expectedFinalStr, finalStr);
-    }
-
-    /**
-     * Converting a JSON doc containing a named array to JSONObject, then
-     * XML.toString() should result in valid XML.
-     */
-    @Test
-    public void shouldHandleArraytoString() {
-        String expectedStr = 
-            "{\"addresses\":{"+
-            "\"something\":[1, 2, 3]}}";
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        String finalStr = XML.toString(expectedJsonObject);
-        String expectedFinalStr = ""+
-                "123"+
-                "";
-        assertEquals("Should handle expectedFinal: ["+expectedStr+"] final: ["+
-                finalStr+"]", expectedFinalStr, finalStr);
-    }
-    
-    /**
-     * Tests that the XML output for empty arrays is consistent.
-     */
-    @Test
-    public void shouldHandleEmptyArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("array",new Object[]{});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("array",new JSONArray());
-
-        final String expected = "";
-        String output1 = XML.toString(jo1,"jo");
-        assertEquals("Expected an empty root tag", expected, output1);
-        String output2 = XML.toString(jo2,"jo");
-        assertEquals("Expected an empty root tag", expected, output2);
-    }
-    
-    /**
-     * Tests that the XML output for arrays is consistent when an internal array is empty.
-     */
-    @Test
-    public void shouldHandleEmptyMultiArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("arr",new Object[]{"One", new String[]{}, "Four"});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("arr",new JSONArray(new Object[]{"One", new JSONArray(new String[]{}), "Four"}));
-
-        final String expected = "OneFour";
-        String output1 = XML.toString(jo1,"jo");
-        assertEquals("Expected a matching array", expected, output1);
-        String output2 = XML.toString(jo2,"jo");
-        assertEquals("Expected a matching array", expected, output2);
-    }
-   
-    /**
-     * Tests that the XML output for arrays is consistent when arrays are not empty.
-     */
-    @Test
-    public void shouldHandleNonEmptyArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("arr",new String[]{"One", "Two", "Three"});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("arr",new JSONArray(new String[]{"One", "Two", "Three"}));
-
-        final String expected = "OneTwoThree";
-        String output1 = XML.toString(jo1,"jo");
-        assertEquals("Expected a non empty root tag", expected, output1);
-        String output2 = XML.toString(jo2,"jo");
-        assertEquals("Expected a non empty root tag", expected, output2);
-    }
-
-    /**
-     * Tests that the XML output for arrays is consistent when arrays are not empty and contain internal arrays.
-     */
-    @Test
-    public void shouldHandleMultiArray(){
-        final JSONObject jo1 = new JSONObject();
-        jo1.put("arr",new Object[]{"One", new String[]{"Two", "Three"}, "Four"});
-        final JSONObject jo2 = new JSONObject();
-        jo2.put("arr",new JSONArray(new Object[]{"One", new JSONArray(new String[]{"Two", "Three"}), "Four"}));
-
-        final String expected = "OneTwoThreeFour";
-        String output1 = XML.toString(jo1,"jo");
-        assertEquals("Expected a matching array", expected, output1);
-        String output2 = XML.toString(jo2,"jo");
-        assertEquals("Expected a matching array", expected, output2);
-    }
-
-    /**
-     * Converting a JSON doc containing a named array of nested arrays to
-     * JSONObject, then XML.toString() should result in valid XML.
-     */
-    @Test
-    public void shouldHandleNestedArraytoString() {
-        String xmlStr = 
-            "{\"addresses\":{\"address\":{\"name\":\"\",\"nocontent\":\"\","+
-            "\"outer\":[[1], [2], [3]]},\"xsi:noNamespaceSchemaLocation\":\"test.xsd\",\""+
-            "xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"}}";
-        JSONObject jsonObject = new JSONObject(xmlStr);
-        String finalStr = XML.toString(jsonObject);
-        JSONObject finalJsonObject = XML.toJSONObject(finalStr);
-        String expectedStr = "
"+
-                "12"+
-                "3"+
-                "
test.xsdhttp://www.w3.org/2001/XMLSche"+
-                "ma-instance";
-        JSONObject expectedJsonObject = XML.toJSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(finalJsonObject,expectedJsonObject);
-    }
-
-
-    /**
-     * Possible bug: 
-     * Illegal node-names must be converted to legal XML-node-names.
-     * The given example shows 2 nodes which are valid for JSON, but not for XML.
-     * Therefore illegal arguments should be converted to e.g. an underscore (_).
-     */
-    @Test
-    public void shouldHandleIllegalJSONNodeNames()
-    {
-        JSONObject inputJSON = new JSONObject();
-        inputJSON.append("123IllegalNode", "someValue1");
-        inputJSON.append("Illegal@node", "someValue2");
-
-        String result = XML.toString(inputJSON);
-
-        /*
-         * This is invalid XML. Names should not begin with digits or contain
-         * certain values, including '@'. One possible solution is to replace
-         * illegal chars with '_', in which case the expected output would be:
-         * <___IllegalNode>someValue1someValue2
-         */
-        String expected = "<123IllegalNode>someValue1someValue2";
-
-        assertEquals("length",expected.length(), result.length());
-        assertTrue("123IllegalNode",result.contains("<123IllegalNode>someValue1"));
-        assertTrue("Illegal@node",result.contains("someValue2"));
-    }
-
-    /**
-     * JSONObject with NULL value, to XML.toString()
-     */
-    @Test
-    public void shouldHandleNullNodeValue()
-    {
-        JSONObject inputJSON = new JSONObject();
-        inputJSON.put("nullValue", JSONObject.NULL);
-        // This is a possible preferred result
-        // String expectedXML = "";
-        /**
-         * This is the current behavior. JSONObject.NULL is emitted as 
-         * the string, "null".
-         */
-        String actualXML = "null";
-        String resultXML = XML.toString(inputJSON);
-        assertEquals(actualXML, resultXML);
-    }
-
-    /**
-     * Investigate exactly how the "content" keyword works
-     */
-    @Test
-    public void contentOperations() {
-        /*
-         * When a standalone  0) then return]]>";
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("1. 3 items", 3 == jsonObject.length());
-        assertTrue("1. empty tag1", "".equals(jsonObject.get("tag1")));
-        assertTrue("1. empty tag2", "".equals(jsonObject.get("tag2")));
-        assertTrue("1. content found", "if (a < b && a > 0) then return".equals(jsonObject.get("content")));
-
-        // multiple consecutive standalone cdatas are accumulated into an array
-        xmlStr = " 0) then return]]>";
-        jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("2. 3 items", 3 == jsonObject.length());
-        assertTrue("2. empty tag1", "".equals(jsonObject.get("tag1")));
-        assertTrue("2. empty tag2", "".equals(jsonObject.get("tag2")));
-        assertTrue("2. content array found", jsonObject.get("content") instanceof JSONArray);
-        JSONArray jsonArray = jsonObject.getJSONArray("content");
-        assertTrue("2. array size", jsonArray.length() == 2);
-        assertTrue("2. content array entry 0", "if (a < b && a > 0) then return".equals(jsonArray.get(0)));
-        assertTrue("2. content array entry 1", "here is another cdata".equals(jsonArray.get(1)));
-
-        /*
-         * text content is accumulated in a "content" inside a local JSONObject.
-         * If there is only one instance, it is saved in the context (a different JSONObject 
-         * from the calling code. and the content element is discarded. 
-         */
-        xmlStr =  "value 1";
-        jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("3. 2 items", 1 == jsonObject.length());
-        assertTrue("3. value tag1", "value 1".equals(jsonObject.get("tag1")));
-
-        /*
-         * array-style text content (multiple tags with the same name) is 
-         * accumulated in a local JSONObject with key="content" and value=JSONArray,
-         * saved in the context, and then the local JSONObject is discarded.
-         */
-        xmlStr =  "value 12true";
-        jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("4. 1 item", 1 == jsonObject.length());
-        assertTrue("4. content array found", jsonObject.get("tag1") instanceof JSONArray);
-        jsonArray = jsonObject.getJSONArray("tag1");
-        assertTrue("4. array size", jsonArray.length() == 3);
-        assertTrue("4. content array entry 0", "value 1".equals(jsonArray.get(0)));
-        assertTrue("4. content array entry 1", jsonArray.getInt(1) == 2);
-        assertTrue("4. content array entry 2", jsonArray.getBoolean(2) == true);
-
-        /*
-         * Complex content is accumulated in a "content" field. For example, an element
-         * may contain a mix of child elements and text. Each text segment is 
-         * accumulated to content. 
-         */
-        xmlStr =  "val1val2";
-        jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("5. 1 item", 1 == jsonObject.length());
-        assertTrue("5. jsonObject found", jsonObject.get("tag1") instanceof JSONObject);
-        jsonObject = jsonObject.getJSONObject("tag1");
-        assertTrue("5. 2 contained items", 2 == jsonObject.length());
-        assertTrue("5. contained tag", "".equals(jsonObject.get("tag2")));
-        assertTrue("5. contained content jsonArray found", jsonObject.get("content") instanceof JSONArray);
-        jsonArray = jsonObject.getJSONArray("content");
-        assertTrue("5. array size", jsonArray.length() == 2);
-        assertTrue("5. content array entry 0", "val1".equals(jsonArray.get(0)));
-        assertTrue("5. content array entry 1", "val2".equals(jsonArray.get(1)));
-
-        /*
-         * If there is only 1 complex text content, then it is accumulated in a 
-         * "content" field as a string.
-         */
-        xmlStr =  "val1";
-        jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("6. 1 item", 1 == jsonObject.length());
-        assertTrue("6. jsonObject found", jsonObject.get("tag1") instanceof JSONObject);
-        jsonObject = jsonObject.getJSONObject("tag1");
-        assertTrue("6. contained content found", "val1".equals(jsonObject.get("content")));
-        assertTrue("6. contained tag2", "".equals(jsonObject.get("tag2")));
-
-        /*
-         * In this corner case, the content sibling happens to have key=content
-         * We end up with an array within an array, and no content element.
-         * This is probably a bug. 
-         */
-        xmlStr =  "val1";
-        jsonObject = XML.toJSONObject(xmlStr);
-        assertTrue("7. 1 item", 1 == jsonObject.length());
-        assertTrue("7. jsonArray found", jsonObject.get("tag1") instanceof JSONArray);
-        jsonArray = jsonObject.getJSONArray("tag1");
-        assertTrue("array size 1", jsonArray.length() == 1);
-        assertTrue("7. contained array found", jsonArray.get(0) instanceof JSONArray);
-        jsonArray = jsonArray.getJSONArray(0);
-        assertTrue("7. inner array size 2", jsonArray.length() == 2);
-        assertTrue("7. inner array item 0", "val1".equals(jsonArray.get(0)));
-        assertTrue("7. inner array item 1", "".equals(jsonArray.get(1)));
-
-        /*
-         * Confirm behavior of original issue
-         */
-        String jsonStr = 
-                "{"+
-                    "\"Profile\": {"+
-                        "\"list\": {"+
-                            "\"history\": {"+
-                                "\"entries\": ["+
-                                    "{"+
-                                        "\"deviceId\": \"id\","+
-                                        "\"content\": {"+
-                                            "\"material\": ["+
-                                                "{"+
-                                                    "\"stuff\": false"+
-                                                "}"+
-                                            "]"+
-                                        "}"+
-                                    "}"+
-                                "]"+
-                            "}"+
-                        "}"+
-                    "}"+
-                "}";
-        jsonObject = new JSONObject(jsonStr);
-        xmlStr = XML.toString(jsonObject);
-        /*
-         * This is the created XML. Looks like content was mistaken for
-         * complex (child node + text) XML. 
-         *  
-         *      
-         *          
-         *              
-         *                  id
-         *                  {"material":[{"stuff":false}]}
-         *              
-         *          
-         *      
-         *  
-         */
-        assertTrue("nothing to test here, see comment on created XML, above", true);
-    }
-
-    /**
-     * Convenience method, given an input string and expected result,
-     * convert to JSONObject and compare actual to expected result.
-     * @param xmlStr the string to parse
-     * @param expectedStr the expected JSON string
-     */
-    private void compareStringToJSONObject(String xmlStr, String expectedStr) {
-        JSONObject jsonObject = XML.toJSONObject(xmlStr);
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Convenience method, given an input string and expected result,
-     * convert to JSONObject via reader and compare actual to expected result.
-     * @param xmlStr the string to parse
-     * @param expectedStr the expected JSON string
-     */
-    private void compareReaderToJSONObject(String xmlStr, String expectedStr) {
-        JSONObject expectedJsonObject = new JSONObject(expectedStr);
-        Reader reader = new StringReader(xmlStr);
-        JSONObject jsonObject = XML.toJSONObject(reader);
-        Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-    }
-
-    /**
-     * Convenience method, given an input string and expected result, convert to
-     * JSONObject via file and compare actual to expected result.
-     * 
-     * @param xmlStr
-     *            the string to parse
-     * @param expectedStr
-     *            the expected JSON string
-     * @throws IOException
-     */
-    private void compareFileToJSONObject(String xmlStr, String expectedStr) {
-        try {
-            JSONObject expectedJsonObject = new JSONObject(expectedStr);
-            File tempFile = this.testFolder.newFile("fileToJSONObject.xml");
-            FileWriter fileWriter = new FileWriter(tempFile);
-            try {
-                fileWriter.write(xmlStr);
-            } finally {
-                fileWriter.close();
-            }
-
-            Reader reader = new FileReader(tempFile);
-            try {
-                JSONObject jsonObject = XML.toJSONObject(reader);
-                Util.compareActualVsExpectedJsonObjects(jsonObject,expectedJsonObject);
-            } finally {
-                reader.close();
-            }
-        } catch (IOException e) {
-            fail("Error: " +e.getMessage());
-        }
-    }
-
-    /**
-     * JSON string lost leading zero and converted "True" to true.
-     */
-    @Test
-    public void testToJSONArray_jsonOutput() {
-        final String originalXml = "011000True";
-        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
-        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, false);
-
-        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expectedJson);
-    }
-
-    /**
-     * JSON string cannot be reverted to original xml.
-     */
-    @Test
-    public void testToJSONArray_reversibility() {
-        final String originalXml = "011000True";
-        final String revertedXml = XML.toString(XML.toJSONObject(originalXml, false));
-
-        assertNotEquals(revertedXml, originalXml);
-    }
-
-    /**
-     * test passes when using the new method toJsonArray.
-     */
-    @Test
-    public void testToJsonXML() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":\"True\"}}");
-
-        final JSONObject actual = XML.toJSONObject(originalXml,true);
-        
-        Util.compareActualVsExpectedJsonObjects(actual, expected);
-        
-        final String reverseXml = XML.toString(actual);
-        // this reversal isn't exactly the same. use JSONML for an exact reversal
-        // the order of the elements may be differnet as well.
-        final String expectedReverseXml = "01011000True";
-
-        assertEquals("length",expectedReverseXml.length(), reverseXml.length());
-        assertTrue("array contents", reverseXml.contains("011000"));
-        assertTrue("item contents", reverseXml.contains("01"));
-        assertTrue("title contents", reverseXml.contains("True"));
-    }
-    
-    /**
-     * test to validate certain conditions of XML unescaping.
-     */
-    @Test
-    public void testUnescape() {
-        assertEquals("{\"xml\":\"Can cope <;\"}",
-                XML.toJSONObject("Can cope <; ").toString());
-        assertEquals("Can cope <; ", XML.unescape("Can cope <; "));
-
-        assertEquals("{\"xml\":\"Can cope & ;\"}",
-                XML.toJSONObject("Can cope & ; ").toString());
-        assertEquals("Can cope & ; ", XML.unescape("Can cope & ; "));
-
-        assertEquals("{\"xml\":\"Can cope &;\"}",
-                XML.toJSONObject("Can cope &; ").toString());
-        assertEquals("Can cope &; ", XML.unescape("Can cope &; "));
-
-        // unicode entity
-        assertEquals("{\"xml\":\"Can cope 4;\"}",
-                XML.toJSONObject("Can cope 4; ").toString());
-        assertEquals("Can cope 4; ", XML.unescape("Can cope 4; "));
-
-        // double escaped
-        assertEquals("{\"xml\":\"Can cope <\"}",
-                XML.toJSONObject("Can cope &lt; ").toString());
-        assertEquals("Can cope < ", XML.unescape("Can cope &lt; "));
-        
-        assertEquals("{\"xml\":\"Can cope 4\"}",
-                XML.toJSONObject("Can cope &#x34; ").toString());
-        assertEquals("Can cope 4 ", XML.unescape("Can cope &#x34; "));
-
-   }
-
-    /**
-     * test passes when xsi:nil="true" converting to null (JSON specification-like nil conversion enabled)
-     */
-    @Test
-    public void testToJsonWithNullWhenNilConversionEnabled() {
-        final String originalXml = "";
-        final String expectedJsonString = "{\"root\":{\"id\":null}}";
-
-        final JSONObject json = XML.toJSONObject(originalXml,
-                new XMLParserConfiguration()
-                    .withKeepStrings(false)
-                    .withcDataTagName("content")
-                    .withConvertNilAttributeToNull(true));
-        assertEquals(expectedJsonString, json.toString());
-    }
-
-    /**
-     * test passes when xsi:nil="true" not converting to null (JSON specification-like nil conversion disabled)
-     */
-    @Test
-    public void testToJsonWithNullWhenNilConversionDisabled() {
-        final String originalXml = "";
-        final String expectedJsonString = "{\"root\":{\"id\":{\"xsi:nil\":true}}}";
-
-        final JSONObject json = XML.toJSONObject(originalXml, new XMLParserConfiguration());
-        assertEquals(expectedJsonString, json.toString());
-    }
-
-    /**
-     * Tests to verify that supported escapes in XML are converted to actual values.
-     */
-    @Test
-    public void testIssue537CaseSensitiveHexEscapeMinimal(){
-        String xmlStr = 
-            "\n"+
-            "Neutrophils.Hypersegmented | Bld-Ser-Plas";
-        String expectedStr = 
-            "{\"root\":\"Neutrophils.Hypersegmented | Bld-Ser-Plas\"}";
-        JSONObject xmlJSONObj = XML.toJSONObject(xmlStr, true);
-        JSONObject expected = new JSONObject(expectedStr);
-        Util.compareActualVsExpectedJsonObjects(xmlJSONObj, expected);
-    }
-
-    /**
-     * Tests to verify that supported escapes in XML are converted to actual values.
-     */
-    @Test
-    public void testIssue537CaseSensitiveHexEscapeFullFile(){
-        try {
-            InputStream xmlStream = null;
-            try {
-                xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue537.xml");
-                Reader xmlReader = new InputStreamReader(xmlStream, Charset.forName("UTF-8"));
-                JSONObject actual = XML.toJSONObject(xmlReader, true);
-                InputStream jsonStream = null;
-                try {
-                    jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue537.json");
-                    final JSONObject expected = new JSONObject(new JSONTokener(jsonStream));
-                    Util.compareActualVsExpectedJsonObjects(actual,expected);
-                } finally {
-                    if (jsonStream != null) {
-                        jsonStream.close();
-                    }
-                }
-            } finally {
-                if (xmlStream != null) {
-                    xmlStream.close();
-                }
-            }
-        } catch (IOException e) {
-            fail("file writer error: " +e.getMessage());
-        }
-    }
-
-    /**
-     * Tests to verify that supported escapes in XML are converted to actual values.
-     */
-    @Test
-    public void testIssue537CaseSensitiveHexUnEscapeDirect(){
-        String origStr = 
-            "Neutrophils.Hypersegmented | Bld-Ser-Plas";
-        String expectedStr = 
-            "Neutrophils.Hypersegmented | Bld-Ser-Plas";
-        String actualStr = XML.unescape(origStr);
-        
-        assertEquals("Case insensitive Entity unescape",  expectedStr, actualStr);
-    }
-
-    /**
-     * test passes when xsi:type="java.lang.String" not converting to string
-     */
-    @Test
-    public void testToJsonWithTypeWhenTypeConversionDisabled() {
-        String originalXml = "1234";
-        String expectedJsonString = "{\"root\":{\"id\":{\"xsi:type\":\"string\",\"content\":1234}}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration());
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-
-    /**
-     * test passes when xsi:type="java.lang.String" converting to String
-     */
-    @Test
-    public void testToJsonWithTypeWhenTypeConversionEnabled() {
-        String originalXml = "1234"
-                + "1234";
-        String expectedJsonString = "{\"root\":{\"id2\":1234,\"id1\":\"1234\"}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Map> xsiTypeMap = new HashMap>();
-        xsiTypeMap.put("string", new XMLXsiTypeConverter() {
-            @Override public String convert(final String value) {
-                return value;
-            }
-        });
-        xsiTypeMap.put("integer", new XMLXsiTypeConverter() {
-            @Override public Integer convert(final String value) {
-                return Integer.valueOf(value);
-            }
-        });
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withXsiTypeMap(xsiTypeMap));
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-
-    @Test
-    public void testToJsonWithXSITypeWhenTypeConversionEnabled() {
-        String originalXml = "1234554321";
-        String expectedJsonString = "{\"root\":{\"asString\":\"12345\",\"asInt\":54321}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Map> xsiTypeMap = new HashMap>();
-        xsiTypeMap.put("string", new XMLXsiTypeConverter() {
-            @Override public String convert(final String value) {
-                return value;
-            }
-        });
-        xsiTypeMap.put("integer", new XMLXsiTypeConverter() {
-            @Override public Integer convert(final String value) {
-                return Integer.valueOf(value);
-            }
-        });
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withXsiTypeMap(xsiTypeMap));
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-
-    @Test
-    public void testToJsonWithXSITypeWhenTypeConversionNotEnabledOnOne() {
-        String originalXml = "1234554321";
-        String expectedJsonString = "{\"root\":{\"asString\":\"12345\",\"asInt\":54321}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Map> xsiTypeMap = new HashMap>();
-        xsiTypeMap.put("string", new XMLXsiTypeConverter() {
-            @Override public String convert(final String value) {
-                return value;
-            }
-        });
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withXsiTypeMap(xsiTypeMap));
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-
-    @Test
-    public void testXSITypeMapNotModifiable() {
-        Map> xsiTypeMap = new HashMap>();
-        XMLParserConfiguration config = new XMLParserConfiguration().withXsiTypeMap(xsiTypeMap);
-        xsiTypeMap.put("string", new XMLXsiTypeConverter() {
-            @Override public String convert(final String value) {
-                return value;
-            }
-        });
-        assertEquals("Config Conversion Map size is expected to be 0", 0, config.getXsiTypeMap().size());
-
-        try {
-            config.getXsiTypeMap().put("boolean", new XMLXsiTypeConverter() {
-                @Override public Boolean convert(final String value) {
-                    return Boolean.valueOf(value);
-                }
-            });
-            fail("Expected to be unable to modify the config");
-        } catch (Exception ignored) { }
-    }
-
-    @Test
-    public void testIndentComplicatedJsonObject(){
-        String str = "{\n" +
-                "  \"success\": true,\n" +
-                "  \"error\": null,\n" +
-                "  \"response\": [\n" +
-                "    {\n" +
-                "      \"timestamp\": 1664917200,\n" +
-                "      \"dateTimeISO\": \"2022-10-05T00:00:00+03:00\",\n" +
-                "      \"loc\": {\n" +
-                "        \"lat\": 39.91987,\n" +
-                "        \"long\": 32.85427\n" +
-                "      },\n" +
-                "      \"place\": {\n" +
-                "        \"name\": \"ankara\",\n" +
-                "        \"state\": \"an\",\n" +
-                "        \"country\": \"tr\"\n" +
-                "      },\n" +
-                "      \"profile\": {\n" +
-                "        \"tz\": \"Europe/Istanbul\"\n" +
-                "      },\n" +
-                "      \"sun\": {\n" +
-                "        \"rise\": 1664941721,\n" +
-                "        \"riseISO\": \"2022-10-05T06:48:41+03:00\",\n" +
-                "        \"set\": 1664983521,\n" +
-                "        \"setISO\": \"2022-10-05T18:25:21+03:00\",\n" +
-                "        \"transit\": 1664962621,\n" +
-                "        \"transitISO\": \"2022-10-05T12:37:01+03:00\",\n" +
-                "        \"midnightSun\": false,\n" +
-                "        \"polarNight\": false,\n" +
-                "        \"twilight\": {\n" +
-                "          \"civilBegin\": 1664940106,\n" +
-                "          \"civilBeginISO\": \"2022-10-05T06:21:46+03:00\",\n" +
-                "          \"civilEnd\": 1664985136,\n" +
-                "          \"civilEndISO\": \"2022-10-05T18:52:16+03:00\",\n" +
-                "          \"nauticalBegin\": 1664938227,\n" +
-                "          \"nauticalBeginISO\": \"2022-10-05T05:50:27+03:00\",\n" +
-                "          \"nauticalEnd\": 1664987015,\n" +
-                "          \"nauticalEndISO\": \"2022-10-05T19:23:35+03:00\",\n" +
-                "          \"astronomicalBegin\": 1664936337,\n" +
-                "          \"astronomicalBeginISO\": \"2022-10-05T05:18:57+03:00\",\n" +
-                "          \"astronomicalEnd\": 1664988905,\n" +
-                "          \"astronomicalEndISO\": \"2022-10-05T19:55:05+03:00\"\n" +
-                "        }\n" +
-                "      },\n" +
-                "      \"moon\": {\n" +
-                "        \"rise\": 1664976480,\n" +
-                "        \"riseISO\": \"2022-10-05T16:28:00+03:00\",\n" +
-                "        \"set\": 1664921520,\n" +
-                "        \"setISO\": \"2022-10-05T01:12:00+03:00\",\n" +
-                "        \"transit\": 1664994240,\n" +
-                "        \"transitISO\": \"2022-10-05T21:24:00+03:00\",\n" +
-                "        \"underfoot\": 1664949360,\n" +
-                "        \"underfootISO\": \"2022-10-05T08:56:00+03:00\",\n" +
-                "        \"phase\": {\n" +
-                "          \"phase\": 0.3186,\n" +
-                "          \"name\": \"waxing gibbous\",\n" +
-                "          \"illum\": 71,\n" +
-                "          \"age\": 9.41,\n" +
-                "          \"angle\": 0.55\n" +
-                "        }\n" +
-                "      }\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}" ;
-        JSONObject jsonObject = new JSONObject(str);
-        String actualIndentedXmlString = XML.toString(jsonObject, 1);
-        JSONObject actualJsonObject = XML.toJSONObject(actualIndentedXmlString);
-        String expected = "true\n" +
-                "\n" +
-                " 2022-10-05T00:00:00+03:00\n" +
-                " \n" +
-                "  39.91987\n" +
-                "  32.85427\n" +
-                " \n" +
-                " \n" +
-                "  \n" +
-                "   0.3186\n" +
-                "   waxing gibbous\n" +
-                "   0.55\n" +
-                "   71\n" +
-                "   9.41\n" +
-                "  \n" +
-                "  2022-10-05T01:12:00+03:00\n" +
-                "  1664949360\n" +
-                "  1664921520\n" +
-                "  1664994240\n" +
-                "  2022-10-05T21:24:00+03:00\n" +
-                "  2022-10-05T16:28:00+03:00\n" +
-                "  1664976480\n" +
-                "  2022-10-05T08:56:00+03:00\n" +
-                " \n" +
-                " \n" +
-                "  Europe/Istanbul\n" +
-                " \n" +
-                " \n" +
-                "  tr\n" +
-                "  ankara\n" +
-                "  an\n" +
-                " \n" +
-                " \n" +
-                "  2022-10-05T18:25:21+03:00\n" +
-                "  false\n" +
-                "  1664983521\n" +
-                "  1664962621\n" +
-                "  false\n" +
-                "  2022-10-05T12:37:01+03:00\n" +
-                "  2022-10-05T06:48:41+03:00\n" +
-                "  1664941721\n" +
-                "  \n" +
-                "   1664985136\n" +
-                "   1664936337\n" +
-                "   1664988905\n" +
-                "   2022-10-05T05:18:57+03:00\n" +
-                "   1664940106\n" +
-                "   2022-10-05T19:23:35+03:00\n" +
-                "   2022-10-05T19:55:05+03:00\n" +
-                "   1664938227\n" +
-                "   1664987015\n" +
-                "   2022-10-05T05:50:27+03:00\n" +
-                "   2022-10-05T06:21:46+03:00\n" +
-                "   2022-10-05T18:52:16+03:00\n" +
-                "  \n" +
-                " \n" +
-                " 1664917200\n" +
-                "\n" +
-                "null\n";
-        JSONObject expectedJsonObject = XML.toJSONObject(expected);
-        assertTrue(expectedJsonObject.similar(actualJsonObject));
-
-
-    }
-
-    @Test
-    public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){
-        String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}";
-        JSONObject jsonObject = new JSONObject(jsonString);
-        String expectedXmlString = "two";
-        String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(true));
-        JSONObject actualJsonObject = XML.toJSONObject(xmlForm);
-        JSONObject expectedJsonObject = XML.toJSONObject(expectedXmlString);
-        assertTrue(expectedJsonObject.similar(actualJsonObject));
-    }
-
-    @Test
-    public void shouldNotCreateExplicitEndTagWithEmptyValueWhenNotConfigured(){
-        String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}";
-        JSONObject jsonObject = new JSONObject(jsonString);
-        String expectedXmlString = "two";
-        String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(false));
-        JSONObject actualJsonObject = XML.toJSONObject(xmlForm);
-        JSONObject expectedJsonObject = XML.toJSONObject(expectedXmlString);
-        assertTrue(expectedJsonObject.similar(actualJsonObject));
-    }
-
-
-    @Test
-    public void testIndentSimpleJsonObject(){
-        String str = "{    \"employee\": {  \n" +
-                "        \"name\":       \"sonoo\",   \n" +
-                "        \"salary\":      56000,   \n" +
-                "        \"married\":    true  \n" +
-                "    }}";
-        JSONObject jsonObject = new JSONObject(str);
-        String actual = XML.toString(jsonObject, "Test", 2);
-        JSONObject actualJsonObject = XML.toJSONObject(actual);
-        String expected = "\n" +
-                "  \n" +
-                "    sonoo\n" +
-                "    56000\n" +
-                "    true\n" +
-                "  \n" +
-                "\n";
-        JSONObject expectedJsonObject = XML.toJSONObject(expected);
-        assertTrue(expectedJsonObject.similar(actualJsonObject));
-    }
-
-    @Test
-    public void testIndentSimpleJsonArray(){
-        String str = "[  \n" +
-                "    {\"name\":\"Ram\", \"email\":\"Ram@gmail.com\"},  \n" +
-                "    {\"name\":\"Bob\", \"email\":\"bob32@gmail.com\"}  \n" +
-                "]  ";
-        JSONArray jsonObject = new JSONArray(str);
-        String actual = XML.toString(jsonObject, 2);
-        JSONObject actualJsonObject = XML.toJSONObject(actual);
-        String expected = "\n" +
-                "  Ram\n" +
-                "  Ram@gmail.com\n" +
-                "\n" +
-                "\n" +
-                "  Bob\n" +
-                "  bob32@gmail.com\n" +
-                "\n";
-        JSONObject expectedJsonObject = XML.toJSONObject(expected);
-        assertTrue(expectedJsonObject.similar(actualJsonObject));
-
-
-    }
-
-    @Test
-    public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){
-        try (InputStream jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.json")) {
-            final JSONObject object = new JSONObject(new JSONTokener(jsonStream));
-            String actualString = XML.toString(object, null, XMLParserConfiguration.KEEP_STRINGS, 2);
-            try (InputStream xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.xml")) {
-                int bufferSize = 1024;
-                char[] buffer = new char[bufferSize];
-                StringBuilder expected = new StringBuilder();
-                Reader in = new InputStreamReader(xmlStream, "UTF-8");
-                for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
-                    expected.append(buffer, 0, numRead);
-                }
-                assertTrue(XML.toJSONObject(expected.toString()).similar(XML.toJSONObject(actualString)));
-            }
-        } catch (IOException e) {
-            fail("file writer error: " +e.getMessage());
-        }
-    }
-
-    @Test
-    public void testMaxNestingDepthOf42IsRespected() {
-        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "");
-
-        final int maxNestingDepth = 42;
-
-        try {
-            XML.toJSONObject(wayTooLongMalformedXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
-        }
-    }
-
-    @Test
-    public void testMaxNestingDepthIsRespectedWithValidXML() {
-        final String perfectlyFineXML = "\n" +
-            "  \n" +
-            "    sonoo\n" +
-            "    56000\n" +
-            "    true\n" +
-            "  \n" +
-            "\n";
-
-        final int maxNestingDepth = 1;
-
-        try {
-            XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-
-            fail("Expecting a JSONException");
-        } catch (JSONException e) {
-            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
-                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
-        }
-    }
-
-    @Test
-    public void testMaxNestingDepthWithValidFittingXML() {
-        final String perfectlyFineXML = "\n" +
-            "  \n" +
-            "    sonoo\n" +
-            "    56000\n" +
-            "    true\n" +
-            "  \n" +
-            "\n";
-
-        final int maxNestingDepth = 3;
-
-        try {
-            XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
-                "parameter of the XMLParserConfiguration used");
-        }
-    }
-    @Test
-    public void testWithWhitespaceTrimmingDisabled() {
-        String originalXml = " Test Whitespace String \t ";
-
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(false));
-        String expectedJsonString = "{\"testXml\":\" Test Whitespace String \t \"}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-    @Test
-    public void testNestedWithWhitespaceTrimmingDisabled() {
-        String originalXml =
-                "\n"+
-                        "\n"+
-                        "   
\n"+
-                        "       Sherlock Holmes \n"+
-                        "   
\n"+
-                        "";
-
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(false));
-        String expectedJsonString = "{\"addresses\":{\"address\":{\"name\":\" Sherlock Holmes \"}}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-    @Test
-    public void shouldTrimWhitespaceDoesNotSupportTagsEqualingCDataTagName() {
-    // When using withShouldTrimWhitespace = true, input containing tags with same name as cDataTagName is unsupported and should not be used in conjunction
-        String originalXml =
-                "\n"+
-                        "\n"+
-                        "   
\n"+
-                        "       Sherlock Holmes \n"+
-                        "   
\n"+
-                        "";
-
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(false).withcDataTagName("content"));
-        String expectedJsonString = "{\"addresses\":{\"address\":[[\"\\n      \",\" Sherlock Holmes \",\"\\n   \"]]}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-    @Test
-    public void shouldTrimWhitespaceEnabledDropsTagsEqualingCDataTagNameButValueRemains() {
-        String originalXml =
-                "\n"+
-                        "\n"+
-                        "   
\n"+
-                        "       Sherlock Holmes \n"+
-                        "   
\n"+
-                        "";
-
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(true).withcDataTagName("content"));
-        String expectedJsonString = "{\"addresses\":{\"address\":\"Sherlock Holmes\"}}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-    @Test
-    public void testWithWhitespaceTrimmingEnabled() {
-        String originalXml = " Test Whitespace String \t ";
-
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(true));
-        String expectedJsonString = "{\"testXml\":\"Test Whitespace String\"}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-    @Test
-    public void testWithWhitespaceTrimmingEnabledByDefault() {
-        String originalXml = " Test Whitespace String \t ";
-
-        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration());
-        String expectedJsonString = "{\"testXml\":\"Test Whitespace String\"}";
-        JSONObject expectedJson = new JSONObject(expectedJsonString);
-        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
-    }
-
-    @Test
-    public void clarifyCurrentBehavior() {
-
-        // Behavior documented in #826
-        // After reverting the code, amount is stored as numeric, and phone is stored as string
-        String str1 =
-                "    \n" +
-                "        0123456789\n" +
-                "        0.1230\n" +
-                "        true\n" +
-                "    ";
-        JSONObject jsonObject1 = XML.toJSONObject(str1,
-                new XMLParserConfiguration().withKeepStrings(false));
-        assertEquals(jsonObject1.getJSONObject("datatypes").getFloat("amount"), 0.123, .1);
-        assertEquals(jsonObject1.getJSONObject("datatypes").getString("telephone"), "0123456789");
-
-
-        // Behavior documented in #852
-        // After reverting the code, value is still stored as a number. This is due to how XML.isDecimalNotation() works
-        // and is probably a bug. JSONObject has a similar problem.
-        String str2 = " primary 008E97 ";
-        JSONObject jsonObject2 = XML.toJSONObject(str2);
-        assertEquals(jsonObject2.getJSONObject("color").getLong("value"), 0e897, .1);
-
-        // Workaround for now is to use keepStrings
-        JSONObject jsonObject3 = XML.toJSONObject(str2, new XMLParserConfiguration().withKeepStrings(true));
-        assertEquals(jsonObject3.getJSONObject("color").getString("value"), "008E97");
-    }
-
-}
-
-
-
diff --git a/src/test/java/org/json/junit/data/BrokenToString.java b/src/test/java/org/json/junit/data/BrokenToString.java
deleted file mode 100644
index 585d751..0000000
--- a/src/test/java/org/json/junit/data/BrokenToString.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.json.junit.data;
-
-/**
- * test class for verifying write errors.
- * @author John Aylward
- *
- */
-public class BrokenToString {
-    @Override
-    public String toString() {
-        throw new IllegalStateException("Something went horribly wrong!");
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/ExceptionalBean.java b/src/test/java/org/json/junit/data/ExceptionalBean.java
deleted file mode 100644
index 91067b8..0000000
--- a/src/test/java/org/json/junit/data/ExceptionalBean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * 
- */
-package org.json.junit.data;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Object for testing the exception handling in {@link org.json.JSONObject#populateMap}.
- * 
- * @author John Aylward
- */
-public class ExceptionalBean {
-    /**
-     * @return a closeable.
-     */
-    public Closeable getCloseable() {
-        // anonymous inner class did not work...
-        return new MyCloseable();
-    }
-
-    /**
-     * @return Nothing really. Just can't be void.
-     * @throws IllegalAccessException
-     *             always thrown
-     */
-    public int getIllegalAccessException() throws IllegalAccessException {
-        throw new IllegalAccessException("Yup, it's illegal");
-    }
-
-    /**
-     * @return Nothing really. Just can't be void.
-     * @throws IllegalArgumentException
-     *             always thrown
-     */
-    public int getIllegalArgumentException() throws IllegalArgumentException {
-        throw new IllegalArgumentException("Yup, it's illegal");
-    }
-
-    /**
-     * @return Nothing really. Just can't be void.
-     * @throws InvocationTargetException
-     *             always thrown
-     */
-    public int getInvocationTargetException() throws InvocationTargetException {
-        throw new InvocationTargetException(new Exception("Yup, it's illegal"));
-    }
-
-    /** My closeable class. */
-    public static final class MyCloseable implements Closeable {
-
-        /**
-         * @return a string
-         */
-        public String getString() {
-            return "Yup, it's closeable";
-        }
-
-        @Override
-        public void close() throws IOException {
-            throw new IOException("Closing is too hard!");
-        }
-    }
-}
diff --git a/src/test/java/org/json/junit/data/Fraction.java b/src/test/java/org/json/junit/data/Fraction.java
deleted file mode 100644
index c418179..0000000
--- a/src/test/java/org/json/junit/data/Fraction.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.json.junit.data;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.math.RoundingMode;
-
-/**
- * basic fraction class, no frills.
- * @author John Aylward
- *
- */
-public class Fraction extends Number implements Comparable {
-    /**
-     * serial id.
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * value as a big decimal.
-     */
-    private final BigDecimal bigDecimal;
-
-    /**
-     * value of the denominator.
-     */
-    private final BigInteger denominator;
-    /**
-     * value of the numerator.
-     */
-    private final BigInteger numerator;
-
-    /**
-     * @param numerator
-     *            numerator
-     * @param denominator
-     *            denominator
-     */
-    public Fraction(final BigInteger numerator, final BigInteger denominator) {
-        super();
-        if (numerator == null || denominator == null) {
-            throw new IllegalArgumentException("All values must be non-null");
-        }
-        if (denominator.compareTo(BigInteger.ZERO)==0) {
-            throw new IllegalArgumentException("Divide by zero");
-        }
-
-        final BigInteger n;
-        final BigInteger d;
-        // normalize fraction
-        if (denominator.signum()<0) {
-            n = numerator.negate();
-            d = denominator.negate();
-        } else {
-            n = numerator;
-            d = denominator;
-        }
-        this.numerator = n;
-        this.denominator = d;
-        if (n.compareTo(BigInteger.ZERO)==0) {
-            this.bigDecimal = BigDecimal.ZERO;
-        } else if (n.compareTo(d)==0) {// i.e. 4/4, 10/10
-            this.bigDecimal = BigDecimal.ONE;
-        } else {
-            this.bigDecimal = new BigDecimal(this.numerator).divide(new BigDecimal(this.denominator),
-                    RoundingMode.HALF_EVEN);
-        }
-    }
-    
-    /**
-     * @param numerator
-     *            numerator
-     * @param denominator
-     *            denominator
-     */
-    public Fraction(final long numerator, final long denominator) {
-        this(BigInteger.valueOf(numerator),BigInteger.valueOf(denominator));
-    }    
-
-    /**
-     * @return the decimal
-     */
-    public BigDecimal bigDecimalValue() {
-        return this.bigDecimal;
-    }
-
-    @Override
-    public int compareTo(final Fraction o) {
-        // .equals call this, so no .equals compare allowed
-
-        // if they are the same reference, just return equals
-        if (this == o) {
-            return 0;
-        }
-
-        // if my denominators are already equal, just compare the numerators
-        if (this.denominator.compareTo(o.denominator)==0) {
-            return this.numerator.compareTo(o.numerator);
-        }
-
-        // get numerators of common denominators
-        // a    x     ay   xb
-        // --- --- = ---- ----
-        // b    y     by   yb
-        final BigInteger thisN = this.numerator.multiply(o.denominator);
-        final BigInteger otherN = o.numerator.multiply(this.denominator);
-
-        return thisN.compareTo(otherN);
-    }
-
-    @Override
-    public double doubleValue() {
-        return this.bigDecimal.doubleValue();
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (this.getClass() != obj.getClass()) {
-            return false;
-        }
-        final Fraction other = (Fraction) obj;
-        return this.compareTo(other) == 0;
-    }
-
-    @Override
-    public float floatValue() {
-        return this.bigDecimal.floatValue();
-    }
-
-    /**
-     * @return the denominator
-     */
-    public BigInteger getDenominator() {
-        return this.denominator;
-    }
-
-    /**
-     * @return the numerator
-     */
-    public BigInteger getNumerator() {
-        return this.numerator;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (this.bigDecimal == null ? 0 : this.bigDecimal.hashCode());
-        return result;
-    }
-
-    @Override
-    public int intValue() {
-        return this.bigDecimal.intValue();
-    }
-
-    @Override
-    public long longValue() {
-        return this.bigDecimal.longValue();
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return this.numerator + "/" + this.denominator;
-    }
-}
diff --git a/src/test/java/org/json/junit/data/GenericBean.java b/src/test/java/org/json/junit/data/GenericBean.java
deleted file mode 100644
index dd46b88..0000000
--- a/src/test/java/org/json/junit/data/GenericBean.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.json.junit.data;
-
-import java.io.StringReader;
-
-/**
- * 
- * @author John Aylward
- *
- * @param 
- *            generic number value
- */
-public class GenericBean implements MyBean {
-    /**
-     * @param genericValue
-     *            value to initiate with
-     */
-    public GenericBean(T genericValue) {
-        super();
-        this.genericValue = genericValue;
-    }
-
-    /** */
-    protected T genericValue;
-    /** to be used by the calling test to see how often the getter is called */
-    public int genericGetCounter;
-    /** to be used by the calling test to see how often the setter is called */
-    public int genericSetCounter;
-
-    /** @return the genericValue */
-    public T getGenericValue() {
-        this.genericGetCounter++;
-        return this.genericValue;
-    }
-
-    /**
-     * @param genericValue
-     *            generic value to set
-     */
-    public void setGenericValue(T genericValue) {
-        this.genericSetCounter++;
-        this.genericValue = genericValue;
-    }
-
-    @Override
-    public Integer getIntKey() {
-        return Integer.valueOf(42);
-    }
-
-    @Override
-    public Double getDoubleKey() {
-        return Double.valueOf(4.2);
-    }
-
-    @Override
-    public String getStringKey() {
-        return "MyString Key";
-    }
-
-    @Override
-    public String getEscapeStringKey() {
-        return "\"My String with \"s";
-    }
-
-    @Override
-    public Boolean isTrueKey() {
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean isFalseKey() {
-        return Boolean.FALSE;
-    }
-
-    @Override
-    public StringReader getStringReaderKey() {
-        return new StringReader("Some String Value in a reader");
-    }
-
-}
diff --git a/src/test/java/org/json/junit/data/GenericBeanInt.java b/src/test/java/org/json/junit/data/GenericBeanInt.java
deleted file mode 100644
index 5056611..0000000
--- a/src/test/java/org/json/junit/data/GenericBeanInt.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * 
- */
-package org.json.junit.data;
-
-/**
- * @author john
- *
- */
-public class GenericBeanInt extends GenericBean {
-    /** */
-    final char a = 'A';
-
-    /** @return the a */
-    public char getA() {
-        return this.a;
-    }
-
-    /**
-     * Should not be beanable
-     * 
-     * @return false
-     */
-    public boolean getable() {
-        return false;
-    }
-
-    /**
-     * Should not be beanable
-     * 
-     * @return false
-     */
-    public boolean get() {
-        return false;
-    }
-
-    /**
-     * Should not be beanable
-     * 
-     * @return false
-     */
-    public boolean is() {
-        return false;
-    }
-
-    /**
-     * Should be beanable
-     * 
-     * @return false
-     */
-    public boolean isB() {
-        return this.genericValue.equals((Integer.valueOf(this.a+1)));
-    }
-
-    /**
-     * @param genericValue
-     *            the value to initiate with.
-     */
-    public GenericBeanInt(Integer genericValue) {
-        super(genericValue);
-    }
-
-    /** override to generate a bridge method */
-    @Override
-    public Integer getGenericValue() {
-        return super.getGenericValue();
-    }
-
-}
diff --git a/src/test/java/org/json/junit/data/MyBean.java b/src/test/java/org/json/junit/data/MyBean.java
deleted file mode 100644
index 3190981..0000000
--- a/src/test/java/org/json/junit/data/MyBean.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.json.junit.data;
-
-import java.io.*;
-
-/**
- * Used in testing when Bean behavior is needed
- */
-public interface MyBean {
-    public Integer getIntKey();
-    public Double getDoubleKey();
-    public String getStringKey();
-    public String getEscapeStringKey();
-    public Boolean isTrueKey();
-    public Boolean isFalseKey();
-    public StringReader getStringReaderKey();
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/MyBeanCustomName.java b/src/test/java/org/json/junit/data/MyBeanCustomName.java
deleted file mode 100644
index 56756c2..0000000
--- a/src/test/java/org/json/junit/data/MyBeanCustomName.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.json.junit.data;
-
-import org.json.JSONPropertyName;
-
-/**
- * Test bean for the {@link JSONPropertyName} annotation.
- */
-public class MyBeanCustomName implements MyBeanCustomNameInterface {
-    public int getSomeInt() { return 42; }
-    @JSONPropertyName("")
-    public long getSomeLong() { return 42L; }
-    @JSONPropertyName("myStringField")
-    public String getSomeString() { return "someStringValue"; }
-    @JSONPropertyName("Some Weird NAme that Normally Wouldn't be possible!")
-    public double getMyDouble() { return 0.0d; }
-    @Override
-    public float getSomeFloat() { return 2.0f; }
-    @Override
-    public int getIgnoredInt() { return 40; }
-}
diff --git a/src/test/java/org/json/junit/data/MyBeanCustomNameInterface.java b/src/test/java/org/json/junit/data/MyBeanCustomNameInterface.java
deleted file mode 100644
index b25b578..0000000
--- a/src/test/java/org/json/junit/data/MyBeanCustomNameInterface.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.json.junit.data;
-
-import org.json.JSONPropertyIgnore;
-import org.json.JSONPropertyName;
-
-public interface MyBeanCustomNameInterface {
-    @JSONPropertyName("InterfaceField")
-    float getSomeFloat();
-    @JSONPropertyIgnore
-    int getIgnoredInt();
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/MyBeanCustomNameSubClass.java b/src/test/java/org/json/junit/data/MyBeanCustomNameSubClass.java
deleted file mode 100644
index 8f0500c..0000000
--- a/src/test/java/org/json/junit/data/MyBeanCustomNameSubClass.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 
- */
-package org.json.junit.data;
-
-import org.json.JSONPropertyIgnore;
-import org.json.JSONPropertyName;
-
-/**
- * Test bean to verify that the {@link org.json.JSONPropertyName} annotation
- * is inherited.
- */
-public class MyBeanCustomNameSubClass extends MyBeanCustomName {
-    @Override
-    @JSONPropertyName("forcedInt")
-    public int getIgnoredInt() { return 42*42; }
-    @Override
-    @JSONPropertyName("newIntFieldName")
-    public int getSomeInt() { return 43; }
-    @Override
-    public String getSomeString() { return "subClassString"; }
-    @Override
-    @JSONPropertyName("AMoreNormalName")
-    public double getMyDouble() { return 1.0d; }
-    @Override
-    public float getSomeFloat() { return 3.0f; }
-    @JSONPropertyIgnore
-    @JSONPropertyName("ShouldBeIgnored")
-    public boolean getShouldNotBeJSON() { return true; }
-    @JSONPropertyName("Getable")
-    public boolean getable() { return true; }
-}
diff --git a/src/test/java/org/json/junit/data/MyBigNumberBean.java b/src/test/java/org/json/junit/data/MyBigNumberBean.java
deleted file mode 100644
index 934dfee..0000000
--- a/src/test/java/org/json/junit/data/MyBigNumberBean.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.json.junit.data;
-
-import java.math.*;
-
-/**
- * Used in testing when a Bean containing big numbers is needed
- */
-public interface MyBigNumberBean {
-    public BigInteger getBigInteger();
-    public BigDecimal getBigDecimal();
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/MyEnum.java b/src/test/java/org/json/junit/data/MyEnum.java
deleted file mode 100644
index 50d9a4f..0000000
--- a/src/test/java/org/json/junit/data/MyEnum.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.json.junit.data;
-
-/**
- * An enum with no methods or data
- */
-public enum MyEnum {
-    VAL1,
-    VAL2,
-    VAL3;
-}
diff --git a/src/test/java/org/json/junit/data/MyEnumClass.java b/src/test/java/org/json/junit/data/MyEnumClass.java
deleted file mode 100644
index 0486694..0000000
--- a/src/test/java/org/json/junit/data/MyEnumClass.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.json.junit.data;
-
-/**
- * this is simply a class that contains some enum instances
- */
-public class MyEnumClass {
-    private MyEnum myEnum;
-    private MyEnumField myEnumField;
-
-    public MyEnum getMyEnum() {
-        return this.myEnum;
-    }
-    public void setMyEnum(MyEnum myEnum) {
-        this.myEnum = myEnum;
-    }
-    public MyEnumField getMyEnumField() {
-        return this.myEnumField;
-    }
-    public void setMyEnumField(MyEnumField myEnumField) {
-        this.myEnumField = myEnumField;
-    }
-}
diff --git a/src/test/java/org/json/junit/data/MyEnumField.java b/src/test/java/org/json/junit/data/MyEnumField.java
deleted file mode 100644
index 60e89de..0000000
--- a/src/test/java/org/json/junit/data/MyEnumField.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.json.junit.data;
-
-/**
- * An enum that contains getters and some internal fields
- */
-@SuppressWarnings("boxing")
-public enum MyEnumField {
-    VAL1(1, "val 1"),
-    VAL2(2, "val 2"),
-    VAL3(3, "val 3");
-
-    private String value;
-    private Integer intVal;
-    private MyEnumField(Integer intVal, String value) {
-        this.value = value;
-        this.intVal = intVal;
-    }
-    public String getValue() {
-        return this.value;
-    }
-    public Integer getIntVal() {
-        return this.intVal;
-    }
-    @Override
-    public String toString(){
-        return this.value;
-    }
-}
diff --git a/src/test/java/org/json/junit/data/MyJsonString.java b/src/test/java/org/json/junit/data/MyJsonString.java
deleted file mode 100644
index 4ddde53..0000000
--- a/src/test/java/org/json/junit/data/MyJsonString.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.json.junit.data;
-
-import org.json.*;
-
-/**
- * Used in testing when a JSONString is needed
- */
-public class MyJsonString implements JSONString {
-
-    @Override
-    public String toJSONString() {
-        return "my string";
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/MyLocaleBean.java b/src/test/java/org/json/junit/data/MyLocaleBean.java
deleted file mode 100755
index 5d3cb52..0000000
--- a/src/test/java/org/json/junit/data/MyLocaleBean.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.json.junit.data;
-
-public class MyLocaleBean {
-    private final String id = "beanId";
-    private final String i = "beanI";
-    public String getId() {
-        return this.id;
-    }
-    public String getI() {
-        return this.i;
-    }
-}
diff --git a/src/test/java/org/json/junit/data/MyNumber.java b/src/test/java/org/json/junit/data/MyNumber.java
deleted file mode 100644
index 4b625af..0000000
--- a/src/test/java/org/json/junit/data/MyNumber.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.json.junit.data;
-
-import java.math.BigDecimal;
-
-/**
- * Number override for testing. Number overrides should always override
- * toString, hashCode, and Equals.
- * 
- * @see The
- *      Numbers Classes
- * @see Formatting
- *      Numeric Print Output
- * 
- * @author John Aylward
- */
-public class MyNumber extends Number {
-    private Number number = BigDecimal.valueOf(42);
-    /**
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * @return number!
-     */
-    public Number getNumber() {
-        return this.number;
-    }
-
-    @Override
-    public int intValue() {
-        return getNumber().intValue();
-    }
-
-    @Override
-    public long longValue() {
-        return getNumber().longValue();
-    }
-
-    @Override
-    public float floatValue() {
-        return getNumber().floatValue();
-    }
-
-    @Override
-    public double doubleValue() {
-        return getNumber().doubleValue();
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     * 
-     * Number overrides should in general always override the  toString method.
-     */
-    @Override
-    public String toString() {
-        return getNumber().toString();
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((this.number == null) ? 0 : this.number.hashCode());
-        return result;
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof MyNumber)) {
-            return false;
-        }
-        MyNumber other = (MyNumber) obj;
-        if (this.number == null) {
-            if (other.number != null) {
-                return false;
-            }
-        } else if (!this.number.equals(other.number)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/src/test/java/org/json/junit/data/MyNumberContainer.java b/src/test/java/org/json/junit/data/MyNumberContainer.java
deleted file mode 100644
index 6527652..0000000
--- a/src/test/java/org/json/junit/data/MyNumberContainer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.json.junit.data;
-
-/**
- * Class that holds our MyNumber override as a property.
- * @author John Aylward
- */
-public class MyNumberContainer {
-    private MyNumber myNumber = new MyNumber();
-    /**
-     * @return a MyNumber.
-     */
-    public Number getMyNumber() {return this.myNumber;}
-}
diff --git a/src/test/java/org/json/junit/data/MyPublicClass.java b/src/test/java/org/json/junit/data/MyPublicClass.java
deleted file mode 100644
index 1f30386..0000000
--- a/src/test/java/org/json/junit/data/MyPublicClass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.json.junit.data;
-
-/**
- * Need a class with some public data members for testing
- */
-@SuppressWarnings("boxing")
-public class MyPublicClass {
-    public Integer publicInt = 42;
-    public String publicString = "abc";
-}
diff --git a/src/test/java/org/json/junit/data/RecursiveBean.java b/src/test/java/org/json/junit/data/RecursiveBean.java
deleted file mode 100644
index dad6e7a..0000000
--- a/src/test/java/org/json/junit/data/RecursiveBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.json.junit.data;
-
-/**
- * test class for verifying if recursively defined bean can be correctly identified
- * @author Zetmas
- *
- */
-public class RecursiveBean {
-    private String name;
-    private Object reference;
-    private Object reference2;
-    public String getName() { return name; }
-    public Object getRef() {return reference;}
-    public Object getRef2() {return reference2;}
-    public void setRef(Object refObj) {reference = refObj;}
-    public void setRef2(Object refObj) {reference2 = refObj;}
-
-    public RecursiveBean(String name) {
-        this.name = name;
-        reference = null;
-        reference2 = null;
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/RecursiveBeanEquals.java b/src/test/java/org/json/junit/data/RecursiveBeanEquals.java
deleted file mode 100644
index 1016648..0000000
--- a/src/test/java/org/json/junit/data/RecursiveBeanEquals.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.json.junit.data;
-
-/** test class for verifying if recursively defined bean can be correctly identified */
-public class RecursiveBeanEquals {
-  private final String name;
-  private Object reference;
-
-  public RecursiveBeanEquals(String name) {
-    this.name = name;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public Object getRef() {
-    return reference;
-  }
-
-  public void setRef(Object refObj) {
-    reference = refObj;
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    return other instanceof RecursiveBeanEquals && name.equals(((RecursiveBeanEquals) other).name);
-  }
-
-  @Override
-  public int hashCode() {
-    return name.hashCode();
-  }
-}
diff --git a/src/test/java/org/json/junit/data/Singleton.java b/src/test/java/org/json/junit/data/Singleton.java
deleted file mode 100644
index 224b48a..0000000
--- a/src/test/java/org/json/junit/data/Singleton.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.json.junit.data;
-
-/**
- * Sample singleton for use with bean testing.
- * 
- * @author John Aylward
- *
- */
-public final class Singleton {
-    /** */
-    private int someInt;
-    /** */
-    private String someString;
-    /** single instance. */
-    private static final Singleton INSTANCE = new Singleton();
-
-    /** @return the singleton instance. */
-    public static final Singleton getInstance() {
-        return INSTANCE;
-    }
-
-    /** */
-    private Singleton() {
-        if (INSTANCE != null) {
-            throw new IllegalStateException("Already instantiated");
-        }
-    }
-
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        return INSTANCE;
-    }
-
-    /** @return someInt */
-    public int getSomeInt() {
-        return this.someInt;
-    }
-
-    /**
-     * sets someInt.
-     * 
-     * @param someInt
-     *            the someInt to set
-     */
-    public void setSomeInt(int someInt) {
-        this.someInt = someInt;
-    }
-
-    /** @return someString */
-    public String getSomeString() {
-        return this.someString;
-    }
-
-    /**
-     * sets someString.
-     * 
-     * @param someString
-     *            the someString to set
-     */
-    public void setSomeString(String someString) {
-        this.someString = someString;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + this.someInt;
-        result = prime * result + ((this.someString == null) ? 0 : this.someString.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Singleton other = (Singleton) obj;
-        if (this.someInt != other.someInt)
-            return false;
-        if (this.someString == null) {
-            if (other.someString != null)
-                return false;
-        } else if (!this.someString.equals(other.someString))
-            return false;
-        return true;
-    }
-}
diff --git a/src/test/java/org/json/junit/data/SingletonEnum.java b/src/test/java/org/json/junit/data/SingletonEnum.java
deleted file mode 100644
index 3dd0309..0000000
--- a/src/test/java/org/json/junit/data/SingletonEnum.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.json.junit.data;
-
-/**
- * Sample singleton done as an Enum for use with bean testing.
- * 
- * @author John Aylward
- *
- */
-public enum SingletonEnum {
-    /**
-     * the singleton instance.
-     */
-    INSTANCE;
-    /** */
-    private int someInt;
-    /** */
-    private String someString;
-
-    /** single instance. */
-
-    /**
-     * @return the singleton instance. In a real application, I'd hope no one did
-     *         this to an enum singleton.
-     */
-    public static final SingletonEnum getInstance() {
-        return INSTANCE;
-    }
-
-    /** */
-    private SingletonEnum() {
-    }
-
-    /** @return someInt */
-    public int getSomeInt() {
-        return this.someInt;
-    }
-
-    /**
-     * sets someInt.
-     * 
-     * @param someInt
-     *            the someInt to set
-     */
-    public void setSomeInt(int someInt) {
-        this.someInt = someInt;
-    }
-
-    /** @return someString */
-    public String getSomeString() {
-        return this.someString;
-    }
-
-    /**
-     * sets someString.
-     * 
-     * @param someString
-     *            the someString to set
-     */
-    public void setSomeString(String someString) {
-        this.someString = someString;
-    }
-}
diff --git a/src/test/java/org/json/junit/data/StringsResourceBundle.java b/src/test/java/org/json/junit/data/StringsResourceBundle.java
deleted file mode 100644
index 4479350..0000000
--- a/src/test/java/org/json/junit/data/StringsResourceBundle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.json.junit.data;
-
-import java.util.*;
-
-/**
- * A resource bundle class
- */
-public class StringsResourceBundle extends ListResourceBundle {
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-    static final Object[][] contents = {
-        {"greetings.hello", "Hello, "},
-        {"greetings.world", "World!"},
-        {"farewells.later", "Later, "},
-        {"farewells.gator", "Alligator!"}
-    };
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/data/WeirdList.java b/src/test/java/org/json/junit/data/WeirdList.java
deleted file mode 100644
index 3560586..0000000
--- a/src/test/java/org/json/junit/data/WeirdList.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 
- */
-package org.json.junit.data;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author John Aylward
- */
-public class WeirdList {
-    /** */
-    private final List list = new ArrayList<>();
-
-    /**
-     * @param vals
-     */
-    public WeirdList(Integer... vals) {
-        this.list.addAll(Arrays.asList(vals));
-    }
-
-    /**
-     * @return a copy of the list
-     */
-    public List get() {
-        return new ArrayList<>(this.list);
-    }
-
-    /**
-     * @return a copy of the list
-     */
-    public List getALL() {
-        return new ArrayList<>(this.list);
-    }
-
-    /**
-     * get a value at an index.
-     * 
-     * @param i
-     *            index to get
-     * @return the value at the index
-     */
-    public Integer get(int i) {
-        return this.list.get(i);
-    }
-
-    /**
-     * get a value at an index.
-     * 
-     * @param i
-     *            index to get
-     * @return the value at the index
-     */
-    @SuppressWarnings("boxing")
-    public int getInt(int i) {
-        return this.list.get(i);
-    }
-
-    /**
-     * @param value
-     *            new value to add to the end of the list
-     */
-    public void add(Integer value) {
-        this.list.add(value);
-    }
-}
\ No newline at end of file
diff --git a/src/test/resources/Issue537.json b/src/test/resources/Issue537.json
deleted file mode 100644
index b3c82fe..0000000
--- a/src/test/resources/Issue537.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
- "clinical_study": {
-  "brief_summary": {
-   "textblock": "CLEAR SYNERGY is an international multi center 2x2 randomized placebo controlled trial of"
-  },
-  "brief_title": "CLEAR SYNERGY Neutrophil Substudy",
-  "overall_status": "Recruiting",
-  "eligibility": {
-   "study_pop": {
-    "textblock": "Patients who are randomized to the drug RCT portion of the CLEAR SYNERGY (OASIS 9) trial"
-   },
-   "minimum_age": "19 Years",
-   "sampling_method": "Non-Probability Sample",
-   "gender": "All",
-   "criteria": {
-    "textblock": "Inclusion Criteria:"
-   },
-   "healthy_volunteers": "No",
-   "maximum_age": "110 Years"
-  },
-  "number_of_groups": "2",
-  "source": "NYU Langone Health",
-  "location_countries": {
-   "country": "United States"
-  },
-  "study_design_info": {
-   "time_perspective": "Prospective",
-   "observational_model": "Other"
-  },
-  "last_update_submitted_qc": "September 10, 2019",
-  "intervention_browse": {
-   "mesh_term": "Colchicine"
-  },
-  "official_title": "Studies on the Effects of Colchicine on Neutrophil Biology in Acute Myocardial Infarction: A Substudy of the CLEAR SYNERGY (OASIS 9) Trial",
-  "primary_completion_date": {
-   "type": "Anticipated",
-   "content": "February 1, 2021"
-  },
-  "sponsors": {
-   "lead_sponsor": {
-    "agency_class": "Other",
-    "agency": "NYU Langone Health"
-   },
-   "collaborator": [
-    {
-     "agency_class": "Other",
-     "agency": "Population Health Research Institute"
-    },
-    {
-     "agency_class": "NIH",
-     "agency": "National Heart, Lung, and Blood Institute (NHLBI)"
-    }
-   ]
-  },
-  "overall_official": {
-   "role": "Principal Investigator",
-   "affiliation": "NYU School of Medicine",
-   "last_name": "Binita Shah, MD"
-  },
-  "overall_contact_backup": {
-   "last_name": "Binita Shah, MD"
-  },
-  "condition_browse": {
-   "mesh_term": [
-    "Myocardial Infarction",
-    "ST Elevation Myocardial Infarction",
-    "Infarction"
-   ]
-  },
-  "overall_contact": {
-   "phone": "646-501-9648",
-   "last_name": "Fatmira Curovic",
-   "email": "fatmira.curovic@nyumc.org"
-  },
-  "responsible_party": {
-   "responsible_party_type": "Principal Investigator",
-   "investigator_title": "Assistant Professor of Medicine",
-   "investigator_full_name": "Binita Shah",
-   "investigator_affiliation": "NYU Langone Health"
-  },
-  "study_first_submitted_qc": "March 12, 2019",
-  "start_date": {
-   "type": "Actual",
-   "content": "March 4, 2019"
-  },
-  "has_expanded_access": "No",
-  "study_first_posted": {
-   "type": "Actual",
-   "content": "March 14, 2019"
-  },
-  "arm_group": [
-   {
-    "arm_group_label": "Colchicine"
-   },
-   {
-    "arm_group_label": "Placebo"
-   }
-  ],
-  "primary_outcome": {
-   "measure": "soluble L-selectin",
-   "time_frame": "between baseline and 3 months",
-   "description": "Change in soluble L-selectin between baseline and 3 mo after STEMI in the placebo vs. colchicine groups."
-  },
-  "secondary_outcome": [
-   {
-    "measure": "Other soluble markers of neutrophil activity",
-    "time_frame": "between baseline and 3 months",
-    "description": "Other markers of neutrophil activity will be evaluated at baseline and 3 months after STEMI (myeloperoxidase, matrix metalloproteinase-9, neutrophil gelatinase-associated lipocalin, neutrophil elastase, intercellular/vascular cellular adhesion molecules)"
-   },
-   {
-    "measure": "Markers of systemic inflammation",
-    "time_frame": "between baseline and 3 months",
-    "description": "Markers of systemic inflammation will be evaluated at baseline and 3 months after STEMI (high sensitive CRP, IL-1β)"
-   },
-   {
-    "measure": "Neutrophil-driven responses that may further propagate injury",
-    "time_frame": "between baseline and 3 months",
-    "description": "Neutrophil-driven responses that may further propagate injury will be evaluated at baseline and 3 months after STEMI (neutrophil extracellular traps, neutrophil-derived microparticles)"
-   }
-  ],
-  "oversight_info": {
-   "is_fda_regulated_drug": "No",
-   "is_fda_regulated_device": "No",
-   "has_dmc": "No"
-  },
-  "last_update_posted": {
-   "type": "Actual",
-   "content": "September 12, 2019"
-  },
-  "id_info": {
-   "nct_id": "NCT03874338",
-   "org_study_id": "18-01323",
-   "secondary_id": "1R01HL146206"
-  },
-  "enrollment": {
-   "type": "Anticipated",
-   "content": "670"
-  },
-  "study_first_submitted": "March 12, 2019",
-  "condition": [
-   "Neutrophils.Hypersegmented | Bld-Ser-Plas",
-   "STEMI - ST Elevation Myocardial Infarction"
-  ],
-  "study_type": "Observational",
-  "required_header": {
-   "download_date": "ClinicalTrials.gov processed this data on July 19, 2020",
-   "link_text": "Link to the current ClinicalTrials.gov record.",
-   "url": "https://clinicaltrials.gov/show/NCT03874338"
-  },
-  "last_update_submitted": "September 10, 2019",
-  "completion_date": {
-   "type": "Anticipated",
-   "content": "February 1, 2022"
-  },
-  "location": {
-   "contact": {
-    "phone": "646-501-9648",
-    "last_name": "Fatmira Curovic",
-    "email": "fatmira.curovic@nyumc.org"
-   },
-   "facility": {
-    "address": {
-     "zip": "10016",
-     "country": "United States",
-     "city": "New York",
-     "state": "New York"
-    },
-    "name": "NYU School of Medicine"
-   },
-   "status": "Recruiting",
-   "contact_backup": {
-    "last_name": "Binita Shah, MD"
-   }
-  },
-  "intervention": {
-   "intervention_type": "Drug",
-   "arm_group_label": [
-    "Colchicine",
-    "Placebo"
-   ],
-   "description": "Participants in the main CLEAR SYNERGY trial are randomized to colchicine/spironolactone versus placebo in a 2x2 factorial design. The substudy is interested in the evaluation of biospecimens obtained from patients in the colchicine vs placebo group.",
-   "intervention_name": "Colchicine Pill"
-  },
-  "patient_data": {
-   "sharing_ipd": "No"
-  },
-  "verification_date": "September 2019"
- }
-}
\ No newline at end of file
diff --git a/src/test/resources/Issue537.xml b/src/test/resources/Issue537.xml
deleted file mode 100644
index bf78f3b..0000000
--- a/src/test/resources/Issue537.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-  
-  
-    ClinicalTrials.gov processed this data on July 19, 2020
-    Link to the current ClinicalTrials.gov record.
-    https://clinicaltrials.gov/show/NCT03874338
-  
-  
-    18-01323
-    1R01HL146206
-    NCT03874338
-  
-  CLEAR SYNERGY Neutrophil Substudy
-  Studies on the Effects of Colchicine on Neutrophil Biology in Acute Myocardial Infarction: A Substudy of the CLEAR SYNERGY (OASIS 9) Trial
-  
-    
-      NYU Langone Health
-      Other
-    
-    
-      Population Health Research Institute
-      Other
-    
-    
-      National Heart, Lung, and Blood Institute (NHLBI)
-      NIH
-    
-  
-  NYU Langone Health
-  
-    No
-    No
-    No
-  
-  
-    
-      CLEAR SYNERGY is an international multi center 2x2 randomized placebo controlled trial of
-    
-  
-  Recruiting
-  March 4, 2019
-  February 1, 2022
-  February 1, 2021
-  Observational
-  No
-  
-    Other
-    Prospective
-  
-  
-    soluble L-selectin
-    between baseline and 3 months
-    Change in soluble L-selectin between baseline and 3 mo after STEMI in the placebo vs. colchicine groups.
-  
-  
-    Other soluble markers of neutrophil activity
-    between baseline and 3 months
-    Other markers of neutrophil activity will be evaluated at baseline and 3 months after STEMI (myeloperoxidase, matrix metalloproteinase-9, neutrophil gelatinase-associated lipocalin, neutrophil elastase, intercellular/vascular cellular adhesion molecules)
-  
-  
-    Markers of systemic inflammation
-    between baseline and 3 months
-    Markers of systemic inflammation will be evaluated at baseline and 3 months after STEMI (high sensitive CRP, IL-1β)
-  
-  
-    Neutrophil-driven responses that may further propagate injury
-    between baseline and 3 months
-    Neutrophil-driven responses that may further propagate injury will be evaluated at baseline and 3 months after STEMI (neutrophil extracellular traps, neutrophil-derived microparticles)
-  
-  2
-  670
-  Neutrophils.Hypersegmented | Bld-Ser-Plas
-  STEMI - ST Elevation Myocardial Infarction
-  
-    Colchicine
-  
-  
-    Placebo
-  
-  
-    Drug
-    Colchicine Pill
-    Participants in the main CLEAR SYNERGY trial are randomized to colchicine/spironolactone versus placebo in a 2x2 factorial design. The substudy is interested in the evaluation of biospecimens obtained from patients in the colchicine vs placebo group.
-    Colchicine
-    Placebo
-  
-  
-    
-      
-        Patients who are randomized to the drug RCT portion of the CLEAR SYNERGY (OASIS 9) trial
-      
-    
-    Non-Probability Sample
-    
-      
-        Inclusion Criteria:
-      
-    
-    All
-    19 Years
-    110 Years
-    No
-  
-  
-    Binita Shah, MD
-    Principal Investigator
-    NYU School of Medicine
-  
-  
-    Fatmira Curovic
-    646-501-9648
-    fatmira.curovic@nyumc.org
-  
-  
-    Binita Shah, MD
-  
-  
-    
-      NYU School of Medicine
-      

-        New York
-        New York
-        10016
-        United States
-      

-    
-    Recruiting
-    
-      Fatmira Curovic
-      646-501-9648
-      fatmira.curovic@nyumc.org
-    
-    
-      Binita Shah, MD
-    
-  
-  
-    United States
-  
-  September 2019
-  March 12, 2019
-  March 12, 2019
-  March 14, 2019
-  September 10, 2019
-  September 10, 2019
-  September 12, 2019
-  
-    Principal Investigator
-    NYU Langone Health
-    Binita Shah
-    Assistant Professor of Medicine
-  
-  
-    
-    Myocardial Infarction
-    ST Elevation Myocardial Infarction
-    Infarction
-  
-  
-    
-    Colchicine
-  
-  
-    No
-  
-  
-
diff --git a/src/test/resources/Issue593.json b/src/test/resources/Issue593.json
deleted file mode 100644
index 213625a..0000000
--- a/src/test/resources/Issue593.json
+++ /dev/null
@@ -1,704 +0,0 @@
-{
- "success": true,
- "error": null,
- "response": [
-  {
-   "loc": {
-    "long": 31.25,
-    "lat": 30.063
-   },
-   "interval": "day",
-   "place": {
-    "name": "cairo",
-    "state": "qh",
-    "country": "eg"
-   },
-   "periods": [
-    {
-     "timestamp": 1665032400,
-     "validTime": "2022-10-06T07:00:00+02:00",
-     "dateTimeISO": "2022-10-06T07:00:00+02:00",
-     "maxTempC": 32,
-     "maxTempF": 90,
-     "minTempC": 19,
-     "minTempF": 66,
-     "avgTempC": 25,
-     "avgTempF": 78,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 32,
-     "maxFeelslikeF": 89,
-     "minFeelslikeC": 21,
-     "minFeelslikeF": 70,
-     "avgFeelslikeC": 26,
-     "avgFeelslikeF": 80,
-     "feelslikeC": 21,
-     "feelslikeF": 70,
-     "maxDewpointC": 17,
-     "maxDewpointF": 63,
-     "minDewpointC": 11,
-     "minDewpointF": 52,
-     "avgDewpointC": 14,
-     "avgDewpointF": 58,
-     "dewpointC": 17,
-     "dewpointF": 63,
-     "maxHumidity": 77,
-     "minHumidity": 29,
-     "humidity": 77,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1015,
-     "pressureIN": 29.97,
-     "windDir": "N",
-     "windDirDEG": 353,
-     "windSpeedKTS": 5,
-     "windSpeedKPH": 9,
-     "windSpeedMPH": 6,
-     "windGustKTS": 21,
-     "windGustKPH": 40,
-     "windGustMPH": 25,
-     "windDirMax": "NNW",
-     "windDirMaxDEG": 342,
-     "windSpeedMaxKTS": 9,
-     "windSpeedMaxKPH": 16,
-     "windSpeedMaxMPH": 10,
-     "windDirMin": "N",
-     "windDirMinDEG": 353,
-     "windSpeedMinKTS": 1,
-     "windSpeedMinKPH": 2,
-     "windSpeedMinMPH": 1,
-     "windDir80m": "N",
-     "windDir80mDEG": 11,
-     "windSpeed80mKTS": 12,
-     "windSpeed80mKPH": 22,
-     "windSpeed80mMPH": 13,
-     "windGust80mKTS": 22,
-     "windGust80mKPH": 41,
-     "windGust80mMPH": 25,
-     "windDirMax80m": "NNW",
-     "windDirMax80mDEG": 343,
-     "windSpeedMax80mKTS": 22,
-     "windSpeedMax80mKPH": 41,
-     "windSpeedMax80mMPH": 25,
-     "windDirMin80m": "E",
-     "windDirMin80mDEG": 95,
-     "windSpeedMin80mKTS": 8,
-     "windSpeedMin80mKPH": 15,
-     "windSpeedMin80mMPH": 10,
-     "sky": 22,
-     "cloudsCoded": "FW",
-     "weather": "Mostly Sunny",
-     "weatherCoded": [],
-     "weatherPrimary": "Mostly Sunny",
-     "weatherPrimaryCoded": "::FW",
-     "icon": "fair.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": 6,
-     "solradWM2": 5608,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 778,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665028274,
-     "sunset": 1665070502,
-     "sunriseISO": "2022-10-06T05:51:14+02:00",
-     "sunsetISO": "2022-10-06T17:35:02+02:00"
-    },
-    {
-     "timestamp": 1665118800,
-     "validTime": "2022-10-07T07:00:00+02:00",
-     "dateTimeISO": "2022-10-07T07:00:00+02:00",
-     "maxTempC": 30,
-     "maxTempF": 86,
-     "minTempC": 19,
-     "minTempF": 66,
-     "avgTempC": 24,
-     "avgTempF": 76,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 29,
-     "maxFeelslikeF": 85,
-     "minFeelslikeC": 19,
-     "minFeelslikeF": 67,
-     "avgFeelslikeC": 24,
-     "avgFeelslikeF": 76,
-     "feelslikeC": 19,
-     "feelslikeF": 67,
-     "maxDewpointC": 15,
-     "maxDewpointF": 60,
-     "minDewpointC": 10,
-     "minDewpointF": 50,
-     "avgDewpointC": 12,
-     "avgDewpointF": 54,
-     "dewpointC": 15,
-     "dewpointF": 60,
-     "maxHumidity": 77,
-     "minHumidity": 30,
-     "humidity": 77,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1014,
-     "pressureIN": 29.95,
-     "windDir": "NW",
-     "windDirDEG": 325,
-     "windSpeedKTS": 1,
-     "windSpeedKPH": 2,
-     "windSpeedMPH": 1,
-     "windGustKTS": 16,
-     "windGustKPH": 29,
-     "windGustMPH": 18,
-     "windDirMax": "WNW",
-     "windDirMaxDEG": 298,
-     "windSpeedMaxKTS": 7,
-     "windSpeedMaxKPH": 13,
-     "windSpeedMaxMPH": 8,
-     "windDirMin": "NW",
-     "windDirMinDEG": 325,
-     "windSpeedMinKTS": 1,
-     "windSpeedMinKPH": 2,
-     "windSpeedMinMPH": 1,
-     "windDir80m": "NNW",
-     "windDir80mDEG": 347,
-     "windSpeed80mKTS": 6,
-     "windSpeed80mKPH": 10,
-     "windSpeed80mMPH": 6,
-     "windGust80mKTS": 20,
-     "windGust80mKPH": 37,
-     "windGust80mMPH": 23,
-     "windDirMax80m": "NW",
-     "windDirMax80mDEG": 316,
-     "windSpeedMax80mKTS": 20,
-     "windSpeedMax80mKPH": 37,
-     "windSpeedMax80mMPH": 23,
-     "windDirMin80m": "NNW",
-     "windDirMin80mDEG": 347,
-     "windSpeedMin80mKTS": 6,
-     "windSpeedMin80mKPH": 10,
-     "windSpeedMin80mMPH": 6,
-     "sky": 30,
-     "cloudsCoded": "FW",
-     "weather": "Mostly Sunny",
-     "weatherCoded": [],
-     "weatherPrimary": "Mostly Sunny",
-     "weatherPrimaryCoded": "::FW",
-     "icon": "fair.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": 6,
-     "solradWM2": 5486,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 742,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665114710,
-     "sunset": 1665156831,
-     "sunriseISO": "2022-10-07T05:51:50+02:00",
-     "sunsetISO": "2022-10-07T17:33:51+02:00"
-    },
-    {
-     "timestamp": 1665205200,
-     "validTime": "2022-10-08T07:00:00+02:00",
-     "dateTimeISO": "2022-10-08T07:00:00+02:00",
-     "maxTempC": 30,
-     "maxTempF": 87,
-     "minTempC": 19,
-     "minTempF": 66,
-     "avgTempC": 25,
-     "avgTempF": 76,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 30,
-     "maxFeelslikeF": 86,
-     "minFeelslikeC": 19,
-     "minFeelslikeF": 67,
-     "avgFeelslikeC": 25,
-     "avgFeelslikeF": 76,
-     "feelslikeC": 19,
-     "feelslikeF": 67,
-     "maxDewpointC": 15,
-     "maxDewpointF": 59,
-     "minDewpointC": 11,
-     "minDewpointF": 52,
-     "avgDewpointC": 13,
-     "avgDewpointF": 56,
-     "dewpointC": 15,
-     "dewpointF": 59,
-     "maxHumidity": 76,
-     "minHumidity": 32,
-     "humidity": 76,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1014,
-     "pressureIN": 29.94,
-     "windDir": "NNE",
-     "windDirDEG": 21,
-     "windSpeedKTS": 1,
-     "windSpeedKPH": 2,
-     "windSpeedMPH": 1,
-     "windGustKTS": 17,
-     "windGustKPH": 32,
-     "windGustMPH": 20,
-     "windDirMax": "WNW",
-     "windDirMaxDEG": 301,
-     "windSpeedMaxKTS": 7,
-     "windSpeedMaxKPH": 13,
-     "windSpeedMaxMPH": 8,
-     "windDirMin": "NNE",
-     "windDirMinDEG": 21,
-     "windSpeedMinKTS": 1,
-     "windSpeedMinKPH": 2,
-     "windSpeedMinMPH": 1,
-     "windDir80m": "NW",
-     "windDir80mDEG": 309,
-     "windSpeed80mKTS": 5,
-     "windSpeed80mKPH": 9,
-     "windSpeed80mMPH": 5,
-     "windGust80mKTS": 17,
-     "windGust80mKPH": 31,
-     "windGust80mMPH": 19,
-     "windDirMax80m": "NW",
-     "windDirMax80mDEG": 322,
-     "windSpeedMax80mKTS": 17,
-     "windSpeedMax80mKPH": 31,
-     "windSpeedMax80mMPH": 19,
-     "windDirMin80m": "NW",
-     "windDirMin80mDEG": 309,
-     "windSpeedMin80mKTS": 5,
-     "windSpeedMin80mKPH": 9,
-     "windSpeedMin80mMPH": 5,
-     "sky": 47,
-     "cloudsCoded": "SC",
-     "weather": "Partly Cloudy",
-     "weatherCoded": [],
-     "weatherPrimary": "Partly Cloudy",
-     "weatherPrimaryCoded": "::SC",
-     "icon": "pcloudy.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": 7,
-     "solradWM2": 4785,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 682,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665201146,
-     "sunset": 1665243161,
-     "sunriseISO": "2022-10-08T05:52:26+02:00",
-     "sunsetISO": "2022-10-08T17:32:41+02:00"
-    },
-    {
-     "timestamp": 1665291600,
-     "validTime": "2022-10-09T07:00:00+02:00",
-     "dateTimeISO": "2022-10-09T07:00:00+02:00",
-     "maxTempC": 31,
-     "maxTempF": 87,
-     "minTempC": 19,
-     "minTempF": 67,
-     "avgTempC": 25,
-     "avgTempF": 77,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 30,
-     "maxFeelslikeF": 86,
-     "minFeelslikeC": 20,
-     "minFeelslikeF": 67,
-     "avgFeelslikeC": 25,
-     "avgFeelslikeF": 77,
-     "feelslikeC": 20,
-     "feelslikeF": 67,
-     "maxDewpointC": 17,
-     "maxDewpointF": 63,
-     "minDewpointC": 11,
-     "minDewpointF": 52,
-     "avgDewpointC": 14,
-     "avgDewpointF": 57,
-     "dewpointC": 17,
-     "dewpointF": 63,
-     "maxHumidity": 86,
-     "minHumidity": 31,
-     "humidity": 86,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1016,
-     "pressureIN": 29.99,
-     "windDir": "N",
-     "windDirDEG": 356,
-     "windSpeedKTS": 2,
-     "windSpeedKPH": 4,
-     "windSpeedMPH": 2,
-     "windGustKTS": 19,
-     "windGustKPH": 36,
-     "windGustMPH": 22,
-     "windDirMax": "NNW",
-     "windDirMaxDEG": 343,
-     "windSpeedMaxKTS": 8,
-     "windSpeedMaxKPH": 14,
-     "windSpeedMaxMPH": 9,
-     "windDirMin": "N",
-     "windDirMinDEG": 356,
-     "windSpeedMinKTS": 2,
-     "windSpeedMinKPH": 4,
-     "windSpeedMinMPH": 2,
-     "windDir80m": "NW",
-     "windDir80mDEG": 316,
-     "windSpeed80mKTS": 5,
-     "windSpeed80mKPH": 9,
-     "windSpeed80mMPH": 6,
-     "windGust80mKTS": 20,
-     "windGust80mKPH": 36,
-     "windGust80mMPH": 23,
-     "windDirMax80m": "N",
-     "windDirMax80mDEG": 354,
-     "windSpeedMax80mKTS": 20,
-     "windSpeedMax80mKPH": 36,
-     "windSpeedMax80mMPH": 23,
-     "windDirMin80m": "NW",
-     "windDirMin80mDEG": 316,
-     "windSpeedMin80mKTS": 5,
-     "windSpeedMin80mKPH": 9,
-     "windSpeedMin80mMPH": 6,
-     "sky": 47,
-     "cloudsCoded": "SC",
-     "weather": "Partly Cloudy",
-     "weatherCoded": [],
-     "weatherPrimary": "Partly Cloudy",
-     "weatherPrimaryCoded": "::SC",
-     "icon": "pcloudy.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": 7,
-     "solradWM2": 4768,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 726,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665287583,
-     "sunset": 1665329491,
-     "sunriseISO": "2022-10-09T05:53:03+02:00",
-     "sunsetISO": "2022-10-09T17:31:31+02:00"
-    },
-    {
-     "timestamp": 1665378000,
-     "validTime": "2022-10-10T07:00:00+02:00",
-     "dateTimeISO": "2022-10-10T07:00:00+02:00",
-     "maxTempC": 31,
-     "maxTempF": 87,
-     "minTempC": 21,
-     "minTempF": 70,
-     "avgTempC": 26,
-     "avgTempF": 78,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 30,
-     "maxFeelslikeF": 86,
-     "minFeelslikeC": 21,
-     "minFeelslikeF": 69,
-     "avgFeelslikeC": 25,
-     "avgFeelslikeF": 78,
-     "feelslikeC": 21,
-     "feelslikeF": 69,
-     "maxDewpointC": 16,
-     "maxDewpointF": 61,
-     "minDewpointC": 13,
-     "minDewpointF": 55,
-     "avgDewpointC": 14,
-     "avgDewpointF": 58,
-     "dewpointC": 16,
-     "dewpointF": 61,
-     "maxHumidity": 75,
-     "minHumidity": 35,
-     "humidity": 75,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1017,
-     "pressureIN": 30.03,
-     "windDir": "N",
-     "windDirDEG": 358,
-     "windSpeedKTS": 2,
-     "windSpeedKPH": 4,
-     "windSpeedMPH": 2,
-     "windGustKTS": 16,
-     "windGustKPH": 30,
-     "windGustMPH": 19,
-     "windDirMax": "N",
-     "windDirMaxDEG": 10,
-     "windSpeedMaxKTS": 8,
-     "windSpeedMaxKPH": 15,
-     "windSpeedMaxMPH": 9,
-     "windDirMin": "N",
-     "windDirMinDEG": 358,
-     "windSpeedMinKTS": 2,
-     "windSpeedMinKPH": 4,
-     "windSpeedMinMPH": 2,
-     "windDir80m": "N",
-     "windDir80mDEG": 8,
-     "windSpeed80mKTS": 7,
-     "windSpeed80mKPH": 13,
-     "windSpeed80mMPH": 8,
-     "windGust80mKTS": 19,
-     "windGust80mKPH": 36,
-     "windGust80mMPH": 22,
-     "windDirMax80m": "N",
-     "windDirMax80mDEG": 10,
-     "windSpeedMax80mKTS": 19,
-     "windSpeedMax80mKPH": 36,
-     "windSpeedMax80mMPH": 22,
-     "windDirMin80m": "E",
-     "windDirMin80mDEG": 91,
-     "windSpeedMin80mKTS": 7,
-     "windSpeedMin80mKPH": 13,
-     "windSpeedMin80mMPH": 8,
-     "sky": 64,
-     "cloudsCoded": "SC",
-     "weather": "Partly Cloudy",
-     "weatherCoded": [],
-     "weatherPrimary": "Partly Cloudy",
-     "weatherPrimaryCoded": "::SC",
-     "icon": "pcloudy.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": 6,
-     "solradWM2": 4494,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 597,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665374020,
-     "sunset": 1665415821,
-     "sunriseISO": "2022-10-10T05:53:40+02:00",
-     "sunsetISO": "2022-10-10T17:30:21+02:00"
-    },
-    {
-     "timestamp": 1665464400,
-     "validTime": "2022-10-11T07:00:00+02:00",
-     "dateTimeISO": "2022-10-11T07:00:00+02:00",
-     "maxTempC": 31,
-     "maxTempF": 87,
-     "minTempC": 21,
-     "minTempF": 70,
-     "avgTempC": 26,
-     "avgTempF": 78,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 31,
-     "maxFeelslikeF": 87,
-     "minFeelslikeC": 22,
-     "minFeelslikeF": 72,
-     "avgFeelslikeC": 26,
-     "avgFeelslikeF": 79,
-     "feelslikeC": 22,
-     "feelslikeF": 72,
-     "maxDewpointC": 17,
-     "maxDewpointF": 62,
-     "minDewpointC": 11,
-     "minDewpointF": 51,
-     "avgDewpointC": 13,
-     "avgDewpointF": 55,
-     "dewpointC": 17,
-     "dewpointF": 62,
-     "maxHumidity": 71,
-     "minHumidity": 30,
-     "humidity": 71,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1015,
-     "pressureIN": 29.98,
-     "windDir": "NNE",
-     "windDirDEG": 13,
-     "windSpeedKTS": 8,
-     "windSpeedKPH": 15,
-     "windSpeedMPH": 9,
-     "windGustKTS": 15,
-     "windGustKPH": 28,
-     "windGustMPH": 17,
-     "windDirMax": "NNE",
-     "windDirMaxDEG": 28,
-     "windSpeedMaxKTS": 15,
-     "windSpeedMaxKPH": 28,
-     "windSpeedMaxMPH": 18,
-     "windDirMin": "NNE",
-     "windDirMinDEG": 14,
-     "windSpeedMinKTS": 7,
-     "windSpeedMinKPH": 14,
-     "windSpeedMinMPH": 8,
-     "windDir80m": "NNE",
-     "windDir80mDEG": 16,
-     "windSpeed80mKTS": 10,
-     "windSpeed80mKPH": 19,
-     "windSpeed80mMPH": 12,
-     "windGust80mKTS": 17,
-     "windGust80mKPH": 31,
-     "windGust80mMPH": 19,
-     "windDirMax80m": "NNE",
-     "windDirMax80mDEG": 28,
-     "windSpeedMax80mKTS": 17,
-     "windSpeedMax80mKPH": 31,
-     "windSpeedMax80mMPH": 19,
-     "windDirMin80m": "NNE",
-     "windDirMin80mDEG": 13,
-     "windSpeedMin80mKTS": 9,
-     "windSpeedMin80mKPH": 18,
-     "windSpeedMin80mMPH": 11,
-     "sky": 0,
-     "cloudsCoded": "CL",
-     "weather": "Sunny",
-     "weatherCoded": [],
-     "weatherPrimary": "Sunny",
-     "weatherPrimaryCoded": "::CL",
-     "icon": "sunny.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": null,
-     "solradWM2": 5450,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 758,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665460458,
-     "sunset": 1665502153,
-     "sunriseISO": "2022-10-11T05:54:18+02:00",
-     "sunsetISO": "2022-10-11T17:29:13+02:00"
-    },
-    {
-     "timestamp": 1665550800,
-     "validTime": "2022-10-12T07:00:00+02:00",
-     "dateTimeISO": "2022-10-12T07:00:00+02:00",
-     "maxTempC": 31,
-     "maxTempF": 88,
-     "minTempC": 21,
-     "minTempF": 69,
-     "avgTempC": 26,
-     "avgTempF": 79,
-     "tempC": null,
-     "tempF": null,
-     "maxFeelslikeC": 31,
-     "maxFeelslikeF": 88,
-     "minFeelslikeC": 22,
-     "minFeelslikeF": 72,
-     "avgFeelslikeC": 26,
-     "avgFeelslikeF": 80,
-     "feelslikeC": 22,
-     "feelslikeF": 72,
-     "maxDewpointC": 16,
-     "maxDewpointF": 60,
-     "minDewpointC": 11,
-     "minDewpointF": 51,
-     "avgDewpointC": 13,
-     "avgDewpointF": 55,
-     "dewpointC": 16,
-     "dewpointF": 60,
-     "maxHumidity": 68,
-     "minHumidity": 29,
-     "humidity": 68,
-     "pop": 0,
-     "precipMM": 0,
-     "precipIN": 0,
-     "iceaccum": null,
-     "iceaccumMM": null,
-     "iceaccumIN": null,
-     "snowCM": 0,
-     "snowIN": 0,
-     "pressureMB": 1014,
-     "pressureIN": 29.95,
-     "windDir": "NNE",
-     "windDirDEG": 12,
-     "windSpeedKTS": 8,
-     "windSpeedKPH": 15,
-     "windSpeedMPH": 9,
-     "windGustKTS": 15,
-     "windGustKPH": 28,
-     "windGustMPH": 17,
-     "windDirMax": "E",
-     "windDirMaxDEG": 96,
-     "windSpeedMaxKTS": 14,
-     "windSpeedMaxKPH": 26,
-     "windSpeedMaxMPH": 16,
-     "windDirMin": "NNE",
-     "windDirMinDEG": 12,
-     "windSpeedMinKTS": 7,
-     "windSpeedMinKPH": 13,
-     "windSpeedMinMPH": 8,
-     "windDir80m": "NNE",
-     "windDir80mDEG": 15,
-     "windSpeed80mKTS": 10,
-     "windSpeed80mKPH": 19,
-     "windSpeed80mMPH": 12,
-     "windGust80mKTS": 18,
-     "windGust80mKPH": 33,
-     "windGust80mMPH": 21,
-     "windDirMax80m": "E",
-     "windDirMax80mDEG": 96,
-     "windSpeedMax80mKTS": 18,
-     "windSpeedMax80mKPH": 33,
-     "windSpeedMax80mMPH": 21,
-     "windDirMin80m": "NNE",
-     "windDirMin80mDEG": 15,
-     "windSpeedMin80mKTS": 10,
-     "windSpeedMin80mKPH": 18,
-     "windSpeedMin80mMPH": 11,
-     "sky": 27,
-     "cloudsCoded": "FW",
-     "weather": "Mostly Sunny",
-     "weatherCoded": [],
-     "weatherPrimary": "Mostly Sunny",
-     "weatherPrimaryCoded": "::FW",
-     "icon": "fair.png",
-     "visibilityKM": 24.135,
-     "visibilityMI": 15,
-     "uvi": null,
-     "solradWM2": 4740,
-     "solradMinWM2": 0,
-     "solradMaxWM2": 743,
-     "isDay": true,
-     "maxCoverage": "",
-     "sunrise": 1665546895,
-     "sunset": 1665588484,
-     "sunriseISO": "2022-10-12T05:54:55+02:00",
-     "sunsetISO": "2022-10-12T17:28:04+02:00"
-    }
-   ],
-   "profile": {
-    "tz": "Africa/Cairo",
-    "elevM": 23,
-    "elevFT": 75
-   }
-  }
- ]
-}
\ No newline at end of file
diff --git a/src/test/resources/Issue593.xml b/src/test/resources/Issue593.xml
deleted file mode 100644
index 0c6c038..0000000
--- a/src/test/resources/Issue593.xml
+++ /dev/null
@@ -1,691 +0,0 @@
-true
-
-  
-    31.25
-    30.063
-  
-  
-    23
-    Africa/Cairo
-    75
-  
-  
-    2022-10-06T07:00:00+02:00
-    E
-    95
-    21
-    15
-    10
-    353
-    N
-    2022-10-06T05:51:14+02:00
-    null
-    9
-    null
-    66
-    0
-    Mostly Sunny
-    2022-10-06T17:35:02+02:00
-    32
-    77
-    N
-    89
-    0
-    22
-    25
-    25
-    Mostly Sunny
-    41
-    58
-    41
-    22
-    14
-    0
-    22
-    353
-    16
-    8
-    70
-    2022-10-06T07:00:00+02:00
-    10
-    778
-    25
-    15
-    ::FW
-    1665028274
-    78
-    N
-    
-    fair.png
-    21
-    17
-    FW
-    70
-    29
-    63
-    12
-    0
-    0
-    NNW
-    13
-    22
-    11
-    32
-    1015
-    24.135
-    1665032400
-    90
-    null
-    11
-    0
-    1
-    343
-    21
-    2
-    63
-    1
-    26
-    6
-    NNW
-    17
-    29.97
-    80
-    null
-    true
-    19
-    52
-    5
-    1665070502
-    5608
-    9
-    25
-    77
-    6
-    40
-    342
-    null
-  
-  
-    2022-10-07T07:00:00+02:00
-    NNW
-    347
-    19
-    15
-    8
-    325
-    NW
-    2022-10-07T05:51:50+02:00
-    null
-    7
-    null
-    66
-    0
-    Mostly Sunny
-    2022-10-07T17:33:51+02:00
-    29
-    77
-    NNW
-    85
-    0
-    30
-    23
-    23
-    Mostly Sunny
-    37
-    54
-    37
-    20
-    12
-    0
-    20
-    325
-    13
-    6
-    67
-    2022-10-07T07:00:00+02:00
-    6
-    742
-    24
-    10
-    ::FW
-    1665114710
-    76
-    NW
-    
-    fair.png
-    19
-    15
-    FW
-    67
-    30
-    60
-    6
-    0
-    0
-    WNW
-    6
-    10
-    347
-    30
-    1014
-    24.135
-    1665118800
-    86
-    null
-    10
-    0
-    1
-    316
-    16
-    2
-    60
-    1
-    24
-    6
-    NW
-    15
-    29.95
-    76
-    null
-    true
-    19
-    50
-    1
-    1665156831
-    5486
-    2
-    18
-    77
-    1
-    29
-    298
-    null
-  
-  
-    2022-10-08T07:00:00+02:00
-    NW
-    309
-    19
-    15
-    8
-    21
-    NNE
-    2022-10-08T05:52:26+02:00
-    null
-    7
-    null
-    66
-    0
-    Partly Cloudy
-    2022-10-08T17:32:41+02:00
-    30
-    76
-    NW
-    86
-    0
-    47
-    19
-    19
-    Partly Cloudy
-    31
-    56
-    31
-    17
-    13
-    0
-    17
-    21
-    13
-    5
-    67
-    2022-10-08T07:00:00+02:00
-    5
-    682
-    25
-    9
-    ::SC
-    1665201146
-    76
-    NNE
-    
-    pcloudy.png
-    19
-    15
-    SC
-    67
-    32
-    59
-    5
-    0
-    0
-    WNW
-    5
-    9
-    309
-    30
-    1014
-    24.135
-    1665205200
-    87
-    null
-    11
-    0
-    1
-    322
-    17
-    2
-    59
-    1
-    25
-    7
-    NW
-    15
-    29.94
-    76
-    null
-    true
-    19
-    52
-    1
-    1665243161
-    4785
-    2
-    20
-    76
-    1
-    32
-    301
-    null
-  
-  
-    2022-10-09T07:00:00+02:00
-    NW
-    316
-    20
-    15
-    9
-    356
-    N
-    2022-10-09T05:53:03+02:00
-    null
-    8
-    null
-    67
-    0
-    Partly Cloudy
-    2022-10-09T17:31:31+02:00
-    30
-    86
-    NW
-    86
-    0
-    47
-    23
-    23
-    Partly Cloudy
-    36
-    57
-    36
-    20
-    14
-    0
-    20
-    356
-    14
-    5
-    67
-    2022-10-09T07:00:00+02:00
-    6
-    726
-    25
-    9
-    ::SC
-    1665287583
-    77
-    N
-    
-    pcloudy.png
-    20
-    17
-    SC
-    67
-    31
-    63
-    5
-    0
-    0
-    NNW
-    6
-    9
-    316
-    31
-    1016
-    24.135
-    1665291600
-    87
-    null
-    11
-    0
-    2
-    354
-    19
-    4
-    63
-    2
-    25
-    7
-    N
-    17
-    29.99
-    77
-    null
-    true
-    19
-    52
-    2
-    1665329491
-    4768
-    4
-    22
-    86
-    2
-    36
-    343
-    null
-  
-  
-    2022-10-10T07:00:00+02:00
-    E
-    91
-    21
-    15
-    9
-    358
-    N
-    2022-10-10T05:53:40+02:00
-    null
-    8
-    null
-    70
-    0
-    Partly Cloudy
-    2022-10-10T17:30:21+02:00
-    30
-    75
-    N
-    86
-    0
-    64
-    22
-    22
-    Partly Cloudy
-    36
-    58
-    36
-    19
-    14
-    0
-    19
-    358
-    15
-    7
-    69
-    2022-10-10T07:00:00+02:00
-    8
-    597
-    26
-    13
-    ::SC
-    1665374020
-    78
-    N
-    
-    pcloudy.png
-    21
-    16
-    SC
-    69
-    35
-    61
-    7
-    0
-    0
-    N
-    8
-    13
-    8
-    31
-    1017
-    24.135
-    1665378000
-    87
-    null
-    13
-    0
-    2
-    10
-    16
-    4
-    61
-    2
-    25
-    6
-    N
-    16
-    30.03
-    78
-    null
-    true
-    21
-    55
-    2
-    1665415821
-    4494
-    4
-    19
-    75
-    2
-    30
-    10
-    null
-  
-  
-    2022-10-11T07:00:00+02:00
-    NNE
-    13
-    22
-    15
-    18
-    13
-    NNE
-    2022-10-11T05:54:18+02:00
-    null
-    15
-    null
-    70
-    0
-    Sunny
-    2022-10-11T17:29:13+02:00
-    31
-    71
-    NNE
-    87
-    0
-    0
-    19
-    19
-    Sunny
-    31
-    55
-    31
-    17
-    13
-    0
-    17
-    14
-    28
-    9
-    72
-    2022-10-11T07:00:00+02:00
-    11
-    758
-    26
-    18
-    ::CL
-    1665460458
-    78
-    NNE
-    
-    sunny.png
-    22
-    17
-    CL
-    72
-    30
-    62
-    10
-    0
-    0
-    NNE
-    12
-    19
-    16
-    31
-    1015
-    24.135
-    1665464400
-    87
-    null
-    11
-    0
-    7
-    28
-    15
-    14
-    62
-    8
-    26
-    null
-    NNE
-    17
-    29.98
-    79
-    null
-    true
-    21
-    51
-    8
-    1665502153
-    5450
-    15
-    17
-    71
-    9
-    28
-    28
-    null
-  
-  
-    2022-10-12T07:00:00+02:00
-    NNE
-    15
-    22
-    15
-    16
-    12
-    NNE
-    2022-10-12T05:54:55+02:00
-    null
-    14
-    null
-    69
-    0
-    Mostly Sunny
-    2022-10-12T17:28:04+02:00
-    31
-    68
-    NNE
-    88
-    0
-    27
-    21
-    21
-    Mostly Sunny
-    33
-    55
-    33
-    18
-    13
-    0
-    18
-    12
-    26
-    10
-    72
-    2022-10-12T07:00:00+02:00
-    11
-    743
-    26
-    18
-    ::FW
-    1665546895
-    79
-    NNE
-    
-    fair.png
-    22
-    16
-    FW
-    72
-    29
-    60
-    10
-    0
-    0
-    E
-    12
-    19
-    15
-    31
-    1014
-    24.135
-    1665550800
-    88
-    null
-    11
-    0
-    7
-    96
-    15
-    13
-    60
-    8
-    26
-    null
-    E
-    16
-    29.95
-    80
-    null
-    true
-    21
-    51
-    8
-    1665588484
-    4740
-    15
-    17
-    68
-    9
-    28
-    96
-    null
-  
-  day
-  
-    eg
-    cairo
-    qh
-  
-
-null
diff --git a/src/test/resources/Issue654WellFormedArray.json b/src/test/resources/Issue654WellFormedArray.json
deleted file mode 100644
index 513e1b4..0000000
--- a/src/test/resources/Issue654WellFormedArray.json
+++ /dev/null
@@ -1,822 +0,0 @@
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
-["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",[]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
-]]]]]]]]]]]]
diff --git a/src/test/resources/Issue654WellFormedObject.json b/src/test/resources/Issue654WellFormedObject.json
deleted file mode 100644
index 70344c1..0000000
--- a/src/test/resources/Issue654WellFormedObject.json
+++ /dev/null
@@ -1,822 +0,0 @@
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
-{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
-}}}}}}}}}}}}
diff --git a/src/test/resources/compliantJsonArray.json b/src/test/resources/compliantJsonArray.json
deleted file mode 100644
index d68c995..0000000
--- a/src/test/resources/compliantJsonArray.json
+++ /dev/null
@@ -1,317 +0,0 @@
-[
-  {
-    "_id": "6606c27d2ab4a0102d49420a",
-    "index": 0,
-    "guid": "441331fb-84d1-4873-a649-3814621a0370",
-    "isActive": true,
-    "balance": "$2,691.63",
-    "picture": "http://example.abc/32x32",
-    "age": 26,
-    "eyeColor": "blue",
-    "name": "abc",
-    "gender": "female",
-    "company": "example",
-    "email": "abc@def.com",
-    "phone": "+1 (123) 456-7890",
-    "address": "123 Main St",
-    "about": "Laborum magna tempor officia irure cillum nulla incididunt Lorem dolor veniam elit cupidatat amet. Veniam veniam exercitation nulla consectetur officia esse ex sunt nulla nisi ea cillum nisi reprehenderit. Qui aliquip reprehenderit aliqua aliquip aliquip anim sit magna nostrud dolore veniam velit elit aliquip.\r\n",
-    "registered": "2016-07-22T03:18:11 -01:00",
-    "latitude": -21.544934,
-    "longitude": 72.765495,
-    "tags": [
-      "consectetur",
-      "minim",
-      "sunt",
-      "in",
-      "ut",
-      "velit",
-      "anim"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "abc def"
-      },
-      {
-        "id": 1,
-        "name": "ghi jkl"
-      },
-      {
-        "id": 2,
-        "name": "mno pqr"
-      }
-    ],
-    "greeting": "Hello, abc! You have 10 unread messages.",
-    "favoriteFruit": "banana"
-  },
-  {
-    "_id": "6606c27d0a45df5121fb765f",
-    "index": 1,
-    "guid": "fd774715-de85-44b9-b498-c214d8f68d9f",
-    "isActive": true,
-    "balance": "$2,713.96",
-    "picture": "http://placehold.it/32x32",
-    "age": 27,
-    "eyeColor": "green",
-    "name": "def",
-    "gender": "female",
-    "company": "sample",
-    "email": "def@abc.com",
-    "phone": "+1 (123) 456-78910",
-    "address": "1234 Main St",
-    "about": "Ea id cupidatat eiusmod culpa. Nulla consequat esse elit enim et pariatur eiusmod ipsum. Consequat eu non reprehenderit in.\r\n",
-    "registered": "2015-04-06T07:54:22 -01:00",
-    "latitude": 83.512347,
-    "longitude": -9.368739,
-    "tags": [
-      "excepteur",
-      "non",
-      "nostrud",
-      "laboris",
-      "laboris",
-      "qui",
-      "aute"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "sample example"
-      },
-      {
-        "id": 1,
-        "name": "test name"
-      },
-      {
-        "id": 2,
-        "name": "aaa aaaa"
-      }
-    ],
-    "greeting": "Hello, test! You have 7 unread messages.",
-    "favoriteFruit": "apple"
-  },
-  {
-    "_id": "6606c27dfb3a0e4e7e7183d3",
-    "index": 2,
-    "guid": "688b0c36-98e0-4ee7-86b8-863638d79b5f",
-    "isActive": false,
-    "balance": "$3,514.35",
-    "picture": "http://placehold.it/32x32",
-    "age": 32,
-    "eyeColor": "green",
-    "name": "test",
-    "gender": "female",
-    "company": "test",
-    "email": "test@test.com",
-    "phone": "+1 (123) 456-7890",
-    "address": "123 Main St",
-    "about": "Mollit officia adipisicing ex nisi non Lorem sunt quis est. Irure exercitation duis ipsum qui ullamco eu ea commodo occaecat minim proident. Incididunt nostrud ex cupidatat eiusmod mollit anim irure culpa. Labore voluptate voluptate labore nisi sit eu. Dolor sit proident velit dolor deserunt labore sit ipsum incididunt eiusmod reprehenderit voluptate. Duis anim velit officia laboris consequat officia dolor sint dolor nisi ex.\r\n",
-    "registered": "2021-11-02T12:50:05 -00:00",
-    "latitude": -82.969939,
-    "longitude": 86.415645,
-    "tags": [
-      "aliquip",
-      "et",
-      "est",
-      "nulla",
-      "nulla",
-      "tempor",
-      "adipisicing"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, test! You have 1 unread messages.",
-    "favoriteFruit": "strawberry"
-  },
-  {
-    "_id": "6606c27d204bc2327fc9ba23",
-    "index": 3,
-    "guid": "be970cba-306e-4cbd-be08-c265a43a61fa",
-    "isActive": true,
-    "balance": "$3,691.63",
-    "picture": "http://placehold.it/32x32",
-    "age": 35,
-    "eyeColor": "brown",
-    "name": "another test",
-    "gender": "male",
-    "company": "TEST",
-    "email": "anothertest@anothertest.com",
-    "phone": "+1 (321) 987-6543",
-    "address": "123 Example Main St",
-    "about": "Do proident consectetur minim quis. In adipisicing culpa Lorem fugiat cillum exercitation velit velit. Non voluptate laboris deserunt veniam et sint consectetur irure aliqua quis eiusmod consectetur elit id. Ex sint do anim Lorem excepteur eu nulla.\r\n",
-    "registered": "2020-06-25T04:55:25 -01:00",
-    "latitude": 63.614955,
-    "longitude": -109.299405,
-    "tags": [
-      "irure",
-      "esse",
-      "non",
-      "mollit",
-      "laborum",
-      "adipisicing",
-      "ad"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, another test! You have 5 unread messages.",
-    "favoriteFruit": "apple"
-  },
-  {
-    "_id": "6606c27df63eb5f390cb9989",
-    "index": 4,
-    "guid": "2c3e5115-758d-468e-99c5-c9afa26e1f9f",
-    "isActive": true,
-    "balance": "$1,047.20",
-    "picture": "http://test.it/32x32",
-    "age": 30,
-    "eyeColor": "green",
-    "name": "Test Name",
-    "gender": "female",
-    "company": "test",
-    "email": "testname@testname.com",
-    "phone": "+1 (999) 999-9999",
-    "address": "999 Test Main St",
-    "about": "Voluptate exercitation tempor consectetur velit magna ea occaecat cupidatat consectetur anim aute. Aliquip est aute ipsum laboris non irure qui consectetur tempor quis do ea Lorem. Cupidatat exercitation ad culpa aliqua amet commodo mollit reprehenderit exercitation adipisicing amet et laborum pariatur.\r\n",
-    "registered": "2023-01-19T02:43:18 -00:00",
-    "latitude": 14.15208,
-    "longitude": 170.411535,
-    "tags": [
-      "dolor",
-      "qui",
-      "cupidatat",
-      "aliqua",
-      "laboris",
-      "reprehenderit",
-      "sint"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, test! You have 6 unread messages.",
-    "favoriteFruit": "apple"
-  },
-  {
-    "_id": "6606c27d01d19fa29853d59c",
-    "index": 5,
-    "guid": "816cda74-5d4b-498f-9724-20f340d5f5bf",
-    "isActive": false,
-    "balance": "$2,628.74",
-    "picture": "http://testing.it/32x32",
-    "age": 28,
-    "eyeColor": "green",
-    "name": "Testing",
-    "gender": "female",
-    "company": "test",
-    "email": "testing@testing.com",
-    "phone": "+1 (888) 888-8888",
-    "address": "123 Main St",
-    "about": "Cupidatat non ut nulla qui excepteur in minim non et nulla fugiat. Dolor quis laborum occaecat veniam dolor ullamco deserunt amet veniam dolor quis proident tempor laboris. In cillum duis ut quis. Aliqua cupidatat magna proident velit tempor veniam et consequat laborum ex dolore qui. Incididunt deserunt magna minim Lorem consectetur.\r\n",
-    "registered": "2017-10-14T11:14:08 -01:00",
-    "latitude": -5.345728,
-    "longitude": -9.706491,
-    "tags": [
-      "officia",
-      "velit",
-      "laboris",
-      "qui",
-      "cupidatat",
-      "cupidatat",
-      "ad"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, testing! You have 2 unread messages.",
-    "favoriteFruit": "strawberry"
-  },
-  {
-    "_id": "6606c27d803003cede1d6deb",
-    "index": 6,
-    "guid": "4ee550bc-0920-4104-b3ce-ebf9db6a803f",
-    "isActive": true,
-    "balance": "$1,709.31",
-    "picture": "http://sample.it/32x32",
-    "age": 31,
-    "eyeColor": "blue",
-    "name": "Sample Name",
-    "gender": "female",
-    "company": "Sample",
-    "email": "sample@sample.com",
-    "phone": "+1 (777) 777-7777",
-    "address": "123 Main St",
-    "about": "Lorem ex proident ipsum ullamco velit sit nisi eiusmod cillum. Id tempor irure culpa nisi sit non qui veniam non ut. Aliquip reprehenderit excepteur mollit quis excepteur ex sit. Quis do eu veniam do ullamco occaecat eu cupidatat nisi laborum tempor minim fugiat pariatur. Ex in nulla ex velit.\r\n",
-    "registered": "2019-04-08T03:54:36 -01:00",
-    "latitude": -70.660321,
-    "longitude": 71.547525,
-    "tags": [
-      "consequat",
-      "veniam",
-      "pariatur",
-      "aliqua",
-      "cillum",
-      "eu",
-      "officia"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "Test"
-      },
-      {
-        "id": 1,
-        "name": "Sample"
-      },
-      {
-        "id": 2,
-        "name": "Example"
-      }
-    ],
-    "greeting": "Hello, Sample! You have 6 unread messages.",
-    "favoriteFruit": "apple"
-  }
-]
diff --git a/src/test/resources/compliantJsonObject.json b/src/test/resources/compliantJsonObject.json
deleted file mode 100644
index cb2918d..0000000
--- a/src/test/resources/compliantJsonObject.json
+++ /dev/null
@@ -1,3703 +0,0 @@
-{
-  "a0": [
-    {
-      "id": 0,
-      "name": "Elijah",
-      "city": "Austin",
-      "age": 78,
-      "friends": [
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Watching Sports",
-            "Reading",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Traveling",
-            "Video Games"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 1,
-      "name": "Noah",
-      "city": "Boston",
-      "age": 97,
-      "friends": [
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Watching Sports",
-            "Skiing & Snowboarding",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Running",
-            "Music",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Woodworking",
-            "Calligraphy",
-            "Genealogy"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Walking",
-            "Church Activities"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Music",
-            "Church Activities"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Martial Arts",
-            "Painting",
-            "Jewelry Making"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 2,
-      "name": "Evy",
-      "city": "San Diego",
-      "age": 48,
-      "friends": [
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Reading",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Genealogy",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Collecting",
-            "Writing",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Church Activities",
-            "Jewelry Making"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Calligraphy",
-            "Dancing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 3,
-      "name": "Oliver",
-      "city": "St. Louis",
-      "age": 39,
-      "friends": [
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Watching Sports",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Traveling",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Church Activities",
-            "Running"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Gardening",
-            "Board Games",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Martial Arts",
-            "Video Games",
-            "Reading"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 4,
-      "name": "Michael",
-      "city": "St. Louis",
-      "age": 95,
-      "friends": [
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Movie Watching",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Chris",
-          "hobbies": [
-            "Housework",
-            "Bicycling",
-            "Collecting"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 5,
-      "name": "Michael",
-      "city": "Portland",
-      "age": 19,
-      "friends": [
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Painting",
-            "Television"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Walking",
-            "Watching Sports",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Podcasts",
-            "Jewelry Making"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Eating Out",
-            "Painting"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 6,
-      "name": "Lucas",
-      "city": "Austin",
-      "age": 76,
-      "friends": [
-        {
-          "name": "John",
-          "hobbies": [
-            "Genealogy",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Socializing",
-            "Yoga"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 7,
-      "name": "Michelle",
-      "city": "San Antonio",
-      "age": 25,
-      "friends": [
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Music",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Socializing",
-            "Housework",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Collecting",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Painting",
-            "Church Activities"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Running",
-            "Painting"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 8,
-      "name": "Emily",
-      "city": "Austin",
-      "age": 61,
-      "friends": [
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Bicycling",
-            "Skiing & Snowboarding",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Writing",
-            "Reading",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Eating Out",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Martial Arts",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Board Games",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 9,
-      "name": "Liam",
-      "city": "New Orleans",
-      "age": 33,
-      "friends": [
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Traveling",
-            "Bicycling",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Eating Out",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Jewelry Making",
-            "Yoga",
-            "Podcasts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 10,
-      "name": "Levi",
-      "city": "New Orleans",
-      "age": 59,
-      "friends": [
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Video Games",
-            "Fishing",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Woodworking",
-            "Music",
-            "Reading"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 11,
-      "name": "Lucas",
-      "city": "Portland",
-      "age": 82,
-      "friends": [
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Jewelry Making",
-            "Yoga"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Fishing",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Gardening",
-            "Church Activities",
-            "Fishing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 12,
-      "name": "Kevin",
-      "city": "Charleston",
-      "age": 82,
-      "friends": [
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Fishing",
-            "Writing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 13,
-      "name": "Olivia",
-      "city": "San Antonio",
-      "age": 34,
-      "friends": [
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Yoga",
-            "Traveling",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Team Sports",
-            "Writing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 14,
-      "name": "Robert",
-      "city": "Los Angeles",
-      "age": 49,
-      "friends": [
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Yoga",
-            "Television"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Fishing",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Church Activities",
-            "Television"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Movie Watching",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Golf",
-            "Running",
-            "Cooking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 15,
-      "name": "Grace",
-      "city": "Chicago",
-      "age": 98,
-      "friends": [
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Traveling",
-            "Genealogy"
-          ]
-        },
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Golf",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Reading",
-            "Cooking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 16,
-      "name": "Michael",
-      "city": "New Orleans",
-      "age": 78,
-      "friends": [
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Running",
-            "Housework",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Writing",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Running",
-            "Church Activities"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Volunteer Work",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Socializing",
-            "Watching Sports",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Eating Out",
-            "Walking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 17,
-      "name": "Mateo",
-      "city": "Palm Springs",
-      "age": 19,
-      "friends": [
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Playing Cards",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Gardening",
-            "Board Games",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Board Games",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Golf",
-            "Playing Cards",
-            "Music"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 18,
-      "name": "Levi",
-      "city": "Chicago",
-      "age": 38,
-      "friends": [
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Tennis",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Writing",
-            "Reading",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Collecting",
-            "Video Games"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Shopping",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Dancing",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Podcasts",
-            "Woodworking",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 19,
-      "name": "Luke",
-      "city": "New York City",
-      "age": 49,
-      "friends": [
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Writing",
-            "Playing Cards",
-            "Housework"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Gardening",
-            "Running"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Golf",
-            "Music"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Board Games",
-            "Socializing",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Movie Watching",
-            "Writing",
-            "Fishing"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Golf",
-            "Jewelry Making",
-            "Yoga"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 20,
-      "name": "Camila",
-      "city": "New Orleans",
-      "age": 69,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Video Games",
-            "Collecting",
-            "Painting"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Reading",
-            "Volunteer Work"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 21,
-      "name": "Amelia",
-      "city": "Charleston",
-      "age": 70,
-      "friends": [
-        {
-          "name": "John",
-          "hobbies": [
-            "Quilting",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Painting",
-            "Podcasts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 22,
-      "name": "Victoria",
-      "city": "Miami Beach",
-      "age": 50,
-      "friends": [
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Cooking",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Team Sports",
-            "Genealogy"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 23,
-      "name": "Kevin",
-      "city": "Miami Beach",
-      "age": 93,
-      "friends": [
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Bicycling",
-            "Fishing"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Martial Arts",
-            "Genealogy",
-            "Tennis"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Yoga"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 24,
-      "name": "Daniel",
-      "city": "Saint Augustine",
-      "age": 43,
-      "friends": [
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Calligraphy",
-            "Martial Arts",
-            "Music"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Walking",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Collecting",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Podcasts",
-            "Walking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 25,
-      "name": "Olivia",
-      "city": "Austin",
-      "age": 46,
-      "friends": [
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Podcasts",
-            "Housework"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Golf",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Eating Out",
-            "Music"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Eating Out",
-            "Genealogy",
-            "Reading"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 26,
-      "name": "Michael",
-      "city": "Palm Springs",
-      "age": 62,
-      "friends": [
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Socializing",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Playing Cards",
-            "Shopping",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Music",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Volunteer Work",
-            "Calligraphy",
-            "Jewelry Making"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 27,
-      "name": "Kevin",
-      "city": "San Antonio",
-      "age": 97,
-      "friends": [
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Television",
-            "Quilting",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Shopping",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 28,
-      "name": "Oliver",
-      "city": "Honolulu",
-      "age": 79,
-      "friends": [
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Housework",
-            "Jewelry Making"
-          ]
-        },
-        {
-          "name": "Isabella",
-          "hobbies": [
-            "Volunteer Work",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Traveling",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Chris",
-          "hobbies": [
-            "Shopping",
-            "Church Activities",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Reading",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Socializing",
-            "Collecting",
-            "Cooking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 29,
-      "name": "Levi",
-      "city": "Miami Beach",
-      "age": 46,
-      "friends": [
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Housework",
-            "Video Games",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Golf",
-            "Volunteer Work",
-            "Painting"
-          ]
-        },
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Writing",
-            "Martial Arts",
-            "Television"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 30,
-      "name": "Michael",
-      "city": "Seattle",
-      "age": 18,
-      "friends": [
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Shopping",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Yoga",
-            "Genealogy",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Eating Out",
-            "Church Activities",
-            "Calligraphy"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Board Games",
-            "Television"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 31,
-      "name": "Isabella",
-      "city": "Savannah",
-      "age": 65,
-      "friends": [
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Church Activities",
-            "Housework",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Calligraphy",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Volunteer Work",
-            "Podcasts",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 32,
-      "name": "Chris",
-      "city": "Las Vegas",
-      "age": 31,
-      "friends": [
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Shopping",
-            "Fishing"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Dancing",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Reading",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Traveling",
-            "Golf",
-            "Genealogy"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Video Games",
-            "Shopping",
-            "Walking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 33,
-      "name": "Kevin",
-      "city": "Portland",
-      "age": 51,
-      "friends": [
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Running",
-            "Calligraphy"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Tennis",
-            "Genealogy"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 34,
-      "name": "Sophie",
-      "city": "New York City",
-      "age": 25,
-      "friends": [
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Video Games",
-            "Board Games",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Calligraphy",
-            "Video Games",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 35,
-      "name": "John",
-      "city": "Orlando",
-      "age": 67,
-      "friends": [
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Podcasts",
-            "Skiing & Snowboarding",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Tennis",
-            "Socializing",
-            "Music"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Walking",
-            "Church Activities",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Team Sports",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Isabella",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Dancing",
-            "Painting"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Tennis",
-            "Bicycling"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 36,
-      "name": "Emily",
-      "city": "New York City",
-      "age": 82,
-      "friends": [
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Church Activities",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Running",
-            "Calligraphy",
-            "Tennis"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Dancing",
-            "Socializing"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Genealogy",
-            "Calligraphy",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 37,
-      "name": "Amelia",
-      "city": "New Orleans",
-      "age": 28,
-      "friends": [
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Traveling",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Martial Arts",
-            "Cooking",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Bicycling",
-            "Walking",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Traveling",
-            "Volunteer Work",
-            "Collecting"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 38,
-      "name": "Victoria",
-      "city": "Austin",
-      "age": 71,
-      "friends": [
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Yoga",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Eating Out",
-            "Writing",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Volunteer Work",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Volunteer Work",
-            "Board Games",
-            "Running"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 39,
-      "name": "Mia",
-      "city": "Honolulu",
-      "age": 63,
-      "friends": [
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Volunteer Work",
-            "Housework",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Woodworking",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Martial Arts",
-            "Skiing & Snowboarding",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Collecting",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Television",
-            "Socializing",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Martial Arts",
-            "Woodworking",
-            "Reading"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 40,
-      "name": "Daniel",
-      "city": "Las Vegas",
-      "age": 50,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Bicycling",
-            "Housework"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Woodworking",
-            "Collecting"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 41,
-      "name": "Luke",
-      "city": "Nashville",
-      "age": 84,
-      "friends": [
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Fishing",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Church Activities",
-            "Martial Arts",
-            "Television"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Church Activities",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Calligraphy",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Movie Watching",
-            "Board Games"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 42,
-      "name": "Joe",
-      "city": "Orlando",
-      "age": 28,
-      "friends": [
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Board Games",
-            "Music"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Woodworking",
-            "Yoga",
-            "Music"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Team Sports",
-            "Bicycling"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 43,
-      "name": "Robert",
-      "city": "Boston",
-      "age": 89,
-      "friends": [
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Team Sports",
-            "Church Activities",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Housework",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Watching Sports",
-            "Golf",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Volunteer Work",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Yoga",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Running",
-            "Painting",
-            "Television"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 44,
-      "name": "Mateo",
-      "city": "Palm Springs",
-      "age": 75,
-      "friends": [
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Socializing",
-            "Walking",
-            "Painting"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Bicycling",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Podcasts",
-            "Socializing",
-            "Calligraphy"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Dancing",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Watching Sports",
-            "Yoga",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Housework",
-            "Genealogy"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 45,
-      "name": "Michelle",
-      "city": "Portland",
-      "age": 64,
-      "friends": [
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Watching Sports",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Martial Arts",
-            "Video Games",
-            "Fishing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 46,
-      "name": "Emma",
-      "city": "Portland",
-      "age": 47,
-      "friends": [
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Yoga",
-            "Music",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Traveling",
-            "Movie Watching",
-            "Gardening"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 47,
-      "name": "Elijah",
-      "city": "Chicago",
-      "age": 96,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Video Games",
-            "Watching Sports",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Housework",
-            "Tennis",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Genealogy",
-            "Housework"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 48,
-      "name": "Elijah",
-      "city": "Seattle",
-      "age": 30,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Socializing",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Martial Arts",
-            "Golf",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Gardening",
-            "Bicycling",
-            "Television"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 49,
-      "name": "Sophie",
-      "city": "Palm Springs",
-      "age": 84,
-      "friends": [
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Podcasts",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Volunteer Work",
-            "Bicycling",
-            "Reading"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Television",
-            "Watching Sports",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Bicycling",
-            "Woodworking",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 50,
-      "name": "Sophie",
-      "city": "Chicago",
-      "age": 52,
-      "friends": [
-        {
-          "name": "Chris",
-          "hobbies": [
-            "Collecting",
-            "Dancing",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Watching Sports",
-            "Dancing",
-            "Tennis"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Board Games",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Calligraphy",
-            "Running"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Quilting",
-            "Golf",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Watching Sports",
-            "Jewelry Making"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 51,
-      "name": "Nora",
-      "city": "Lahaina",
-      "age": 79,
-      "friends": [
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Volunteer Work",
-            "Running",
-            "Tennis"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Quilting",
-            "Fishing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 52,
-      "name": "Chris",
-      "city": "Miami Beach",
-      "age": 59,
-      "friends": [
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Video Games",
-            "Traveling",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Shopping",
-            "Calligraphy"
-          ]
-        },
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Playing Cards",
-            "Housework"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Painting",
-            "Housework",
-            "Shopping"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 53,
-      "name": "Kevin",
-      "city": "Boston",
-      "age": 88,
-      "friends": [
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Traveling",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Woodworking",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Collecting",
-            "Running"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Dancing",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Fishing",
-            "Quilting",
-            "Team Sports"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 54,
-      "name": "Grace",
-      "city": "Miami Beach",
-      "age": 62,
-      "friends": [
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Church Activities",
-            "Music"
-          ]
-        },
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Genealogy",
-            "Watching Sports",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Chris",
-          "hobbies": [
-            "Team Sports",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Yoga",
-            "Music",
-            "Running"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 55,
-      "name": "Chloe",
-      "city": "Lahaina",
-      "age": 97,
-      "friends": [
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Genealogy",
-            "Team Sports",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Movie Watching",
-            "Television"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 56,
-      "name": "Zoey",
-      "city": "Saint Augustine",
-      "age": 75,
-      "friends": [
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Bicycling",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Music",
-            "Cooking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 57,
-      "name": "Sophie",
-      "city": "Boston",
-      "age": 26,
-      "friends": [
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Writing",
-            "Yoga",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Board Games",
-            "Martial Arts",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Jewelry Making",
-            "Skiing & Snowboarding",
-            "Fishing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 58,
-      "name": "Emma",
-      "city": "Seattle",
-      "age": 40,
-      "friends": [
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Traveling",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Bicycling",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Board Games",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Yoga",
-            "Shopping"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 59,
-      "name": "Luke",
-      "city": "San Diego",
-      "age": 44,
-      "friends": [
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Calligraphy",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Podcasts",
-            "Movie Watching",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Bicycling",
-            "Golf",
-            "Walking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 60,
-      "name": "Chloe",
-      "city": "Austin",
-      "age": 23,
-      "friends": [
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Martial Arts",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Writing",
-            "Martial Arts",
-            "Jewelry Making"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Video Games",
-            "Bicycling",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Socializing",
-            "Collecting",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Team Sports",
-            "Woodworking",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Yoga",
-            "Music",
-            "Skiing & Snowboarding"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 61,
-      "name": "Nora",
-      "city": "Orlando",
-      "age": 83,
-      "friends": [
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Board Games",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Board Games",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Bicycling",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Church Activities",
-            "Golf",
-            "Socializing"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Running",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Board Games",
-            "Volunteer Work"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 62,
-      "name": "Kevin",
-      "city": "Saint Augustine",
-      "age": 76,
-      "friends": [
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Playing Cards",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Movie Watching",
-            "Calligraphy",
-            "Socializing"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Podcasts",
-            "Yoga",
-            "Quilting"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 63,
-      "name": "Amelia",
-      "city": "Honolulu",
-      "age": 84,
-      "friends": [
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Golf",
-            "Reading"
-          ]
-        },
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Genealogy",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Gardening",
-            "Music"
-          ]
-        },
-        {
-          "name": "Isabella",
-          "hobbies": [
-            "Board Games",
-            "Music"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Cooking",
-            "Eating Out",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Movie Watching",
-            "Church Activities",
-            "Shopping"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 64,
-      "name": "Joe",
-      "city": "San Francisco",
-      "age": 37,
-      "friends": [
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Running",
-            "Podcasts",
-            "Woodworking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 65,
-      "name": "Chloe",
-      "city": "Palm Springs",
-      "age": 60,
-      "friends": [
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Movie Watching",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Volunteer Work",
-            "Socializing"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Church Activities",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Walking",
-            "Team Sports",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 66,
-      "name": "Leo",
-      "city": "New Orleans",
-      "age": 97,
-      "friends": [
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Martial Arts",
-            "Woodworking",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Fishing",
-            "Genealogy",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Traveling",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Church Activities",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Video Games",
-            "Housework"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 67,
-      "name": "Robert",
-      "city": "Austin",
-      "age": 19,
-      "friends": [
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Writing",
-            "Yoga"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Writing",
-            "Socializing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 68,
-      "name": "Robert",
-      "city": "Orlando",
-      "age": 65,
-      "friends": [
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Board Games",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Collecting",
-            "Housework",
-            "Skiing & Snowboarding"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 69,
-      "name": "Mateo",
-      "city": "New Orleans",
-      "age": 95,
-      "friends": [
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Painting",
-            "Eating Out",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Bicycling",
-            "Jewelry Making",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Cooking",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Reading",
-            "Collecting",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Housework",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Dancing",
-            "Yoga"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 70,
-      "name": "Jack",
-      "city": "Boston",
-      "age": 76,
-      "friends": [
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Martial Arts",
-            "Volunteer Work",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Traveling",
-            "Bicycling"
-          ]
-        },
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Podcasts",
-            "Jewelry Making",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Gardening",
-            "Shopping",
-            "Genealogy"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Writing",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 71,
-      "name": "Liam",
-      "city": "Savannah",
-      "age": 37,
-      "friends": [
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Painting",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Dancing",
-            "Fishing"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Television",
-            "Running"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Fishing",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Church Activities",
-            "Calligraphy",
-            "Writing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 72,
-      "name": "Daniel",
-      "city": "Los Angeles",
-      "age": 63,
-      "friends": [
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Television",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Walking",
-            "Socializing",
-            "Writing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 73,
-      "name": "Olivia",
-      "city": "Boston",
-      "age": 89,
-      "friends": [
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Fishing",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Movie Watching",
-            "Board Games"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 74,
-      "name": "Amelia",
-      "city": "Orlando",
-      "age": 40,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Golf",
-            "Reading",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Writing",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Movie Watching",
-            "Music"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Jewelry Making",
-            "Bicycling"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 75,
-      "name": "Camila",
-      "city": "New Orleans",
-      "age": 65,
-      "friends": [
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Yoga",
-            "Reading",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Board Games",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Woodworking",
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Television",
-            "Calligraphy",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Fishing",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 76,
-      "name": "Jack",
-      "city": "Orlando",
-      "age": 42,
-      "friends": [
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Podcasts",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Running",
-            "Shopping",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Chris",
-          "hobbies": [
-            "Martial Arts",
-            "Golf",
-            "Quilting"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Eating Out",
-            "Bicycling",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Church Activities"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 77,
-      "name": "Leo",
-      "city": "Lahaina",
-      "age": 46,
-      "friends": [
-        {
-          "name": "Robert",
-          "hobbies": [
-            "Traveling",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Video Games",
-            "Music"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Video Games",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Painting",
-            "Television"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Dancing",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 78,
-      "name": "Kevin",
-      "city": "San Antonio",
-      "age": 19,
-      "friends": [
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Traveling",
-            "Television"
-          ]
-        },
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Fishing",
-            "Collecting",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Watching Sports",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 79,
-      "name": "Leo",
-      "city": "Sedona",
-      "age": 56,
-      "friends": [
-        {
-          "name": "Mateo",
-          "hobbies": [
-            "Board Games",
-            "Reading"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Reading",
-            "Fishing",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Gardening",
-            "Woodworking"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Video Games",
-            "Television",
-            "Eating Out"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 80,
-      "name": "Charlotte",
-      "city": "Orlando",
-      "age": 73,
-      "friends": [
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Golf",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Shopping",
-            "Yoga",
-            "Genealogy"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Yoga",
-            "Volunteer Work"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 81,
-      "name": "Robert",
-      "city": "Chicago",
-      "age": 52,
-      "friends": [
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Church Activities",
-            "Woodworking",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Board Games",
-            "Socializing"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Housework",
-            "Music",
-            "Calligraphy"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Shopping",
-            "Fishing",
-            "Walking"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Dancing",
-            "Yoga"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 82,
-      "name": "Kevin",
-      "city": "Palm Springs",
-      "age": 75,
-      "friends": [
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Running",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Socializing",
-            "Martial Arts",
-            "Running"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 83,
-      "name": "Evy",
-      "city": "Palm Springs",
-      "age": 51,
-      "friends": [
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Writing",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Yoga",
-            "Quilting",
-            "Fishing"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Painting"
-          ]
-        },
-        {
-          "name": "Olivia",
-          "hobbies": [
-            "Martial Arts",
-            "Shopping",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Reading",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Socializing",
-            "Housework"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 84,
-      "name": "Daniel",
-      "city": "Saint Augustine",
-      "age": 57,
-      "friends": [
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Walking",
-            "Painting",
-            "Reading"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Team Sports",
-            "Board Games"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Jewelry Making",
-            "Eating Out",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Movie Watching",
-            "Video Games"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Watching Sports",
-            "Walking",
-            "Martial Arts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 85,
-      "name": "Olivia",
-      "city": "Charleston",
-      "age": 63,
-      "friends": [
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Reading",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Mia",
-          "hobbies": [
-            "Running",
-            "Shopping"
-          ]
-        },
-        {
-          "name": "John",
-          "hobbies": [
-            "Writing",
-            "Walking",
-            "Tennis"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 86,
-      "name": "Amelia",
-      "city": "Seattle",
-      "age": 96,
-      "friends": [
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Dancing",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Bicycling",
-            "Dancing"
-          ]
-        },
-        {
-          "name": "Daniel",
-          "hobbies": [
-            "Writing",
-            "Shopping",
-            "Tennis"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Board Games",
-            "Walking",
-            "Housework"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Genealogy",
-            "Dancing",
-            "Podcasts"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Movie Watching",
-            "Cooking",
-            "Housework"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 87,
-      "name": "Luke",
-      "city": "Seattle",
-      "age": 26,
-      "friends": [
-        {
-          "name": "Isabella",
-          "hobbies": [
-            "Traveling",
-            "Walking",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Writing",
-            "Housework",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Golf",
-            "Yoga"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Volunteer Work",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Yoga",
-            "Genealogy",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Levi",
-          "hobbies": [
-            "Tennis",
-            "Television"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 88,
-      "name": "Chris",
-      "city": "Nashville",
-      "age": 34,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Podcasts",
-            "Team Sports",
-            "Traveling"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Television",
-            "Woodworking",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Podcasts",
-            "Genealogy",
-            "Calligraphy"
-          ]
-        },
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Fishing",
-            "Church Activities",
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Camila",
-          "hobbies": [
-            "Television",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Michelle",
-          "hobbies": [
-            "Yoga",
-            "Running"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 89,
-      "name": "Michelle",
-      "city": "Honolulu",
-      "age": 85,
-      "friends": [
-        {
-          "name": "Isabella",
-          "hobbies": [
-            "Calligraphy",
-            "Gardening"
-          ]
-        },
-        {
-          "name": "Chloe",
-          "hobbies": [
-            "Shopping",
-            "Playing Cards",
-            "Tennis"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Watching Sports",
-            "Cooking",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Writing",
-            "Tennis",
-            "Playing Cards"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 90,
-      "name": "Lucas",
-      "city": "Los Angeles",
-      "age": 78,
-      "friends": [
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Woodworking",
-            "Painting",
-            "Television"
-          ]
-        },
-        {
-          "name": "Lucas",
-          "hobbies": [
-            "Bicycling",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Grace",
-          "hobbies": [
-            "Dancing",
-            "Running"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 91,
-      "name": "Sophie",
-      "city": "St. Louis",
-      "age": 86,
-      "friends": [
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Socializing",
-            "Music"
-          ]
-        },
-        {
-          "name": "Zoey",
-          "hobbies": [
-            "Running",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Elijah",
-          "hobbies": [
-            "Dancing"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 92,
-      "name": "Victoria",
-      "city": "Saint Augustine",
-      "age": 33,
-      "friends": [
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Socializing",
-            "Fishing"
-          ]
-        },
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Video Games",
-            "Watching Sports"
-          ]
-        },
-        {
-          "name": "Luke",
-          "hobbies": [
-            "Martial Arts"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Traveling",
-            "Quilting",
-            "Television"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Gardening",
-            "Cooking",
-            "Housework"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 93,
-      "name": "Michael",
-      "city": "New Orleans",
-      "age": 82,
-      "friends": [
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Bicycling",
-            "Board Games",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Liam",
-          "hobbies": [
-            "Painting",
-            "Writing",
-            "Bicycling"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 94,
-      "name": "Michael",
-      "city": "Seattle",
-      "age": 49,
-      "friends": [
-        {
-          "name": "John",
-          "hobbies": [
-            "Collecting",
-            "Playing Cards",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Sarah",
-          "hobbies": [
-            "Fishing",
-            "Walking",
-            "Movie Watching"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 95,
-      "name": "Victoria",
-      "city": "Branson",
-      "age": 48,
-      "friends": [
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Painting",
-            "Volunteer Work",
-            "Socializing"
-          ]
-        },
-        {
-          "name": "Evy",
-          "hobbies": [
-            "Skiing & Snowboarding",
-            "Volunteer Work"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Genealogy",
-            "Reading",
-            "Yoga"
-          ]
-        },
-        {
-          "name": "Sophie",
-          "hobbies": [
-            "Movie Watching",
-            "Golf",
-            "Television"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Jewelry Making",
-            "Quilting",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Jack",
-          "hobbies": [
-            "Playing Cards",
-            "Golf"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 96,
-      "name": "Grace",
-      "city": "Seattle",
-      "age": 89,
-      "friends": [
-        {
-          "name": "Chris",
-          "hobbies": [
-            "Board Games",
-            "Golf",
-            "Playing Cards"
-          ]
-        },
-        {
-          "name": "Emily",
-          "hobbies": [
-            "Video Games",
-            "Golf"
-          ]
-        },
-        {
-          "name": "Victoria",
-          "hobbies": [
-            "Housework",
-            "Collecting",
-            "Woodworking"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 97,
-      "name": "Liam",
-      "city": "Nashville",
-      "age": 64,
-      "friends": [
-        {
-          "name": "Kevin",
-          "hobbies": [
-            "Collecting"
-          ]
-        },
-        {
-          "name": "Amelia",
-          "hobbies": [
-            "Golf",
-            "Playing Cards",
-            "Cooking"
-          ]
-        },
-        {
-          "name": "Charlotte",
-          "hobbies": [
-            "Reading",
-            "Board Games",
-            "Genealogy"
-          ]
-        },
-        {
-          "name": "Leo",
-          "hobbies": [
-            "Video Games",
-            "Writing"
-          ]
-        },
-        {
-          "name": "Nora",
-          "hobbies": [
-            "Jewelry Making",
-            "Volunteer Work"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 98,
-      "name": "Mia",
-      "city": "Miami Beach",
-      "age": 77,
-      "friends": [
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Podcasts",
-            "Movie Watching"
-          ]
-        },
-        {
-          "name": "Oliver",
-          "hobbies": [
-            "Playing Cards",
-            "Fishing",
-            "Eating Out"
-          ]
-        },
-        {
-          "name": "Emma",
-          "hobbies": [
-            "Collecting",
-            "Yoga"
-          ]
-        },
-        {
-          "name": "Michael",
-          "hobbies": [
-            "Bicycling",
-            "Team Sports"
-          ]
-        },
-        {
-          "name": "Ava",
-          "hobbies": [
-            "Watching Sports",
-            "Jewelry Making"
-          ]
-        },
-        {
-          "name": "Joe",
-          "hobbies": [
-            "Video Games",
-            "Woodworking",
-            "Music"
-          ]
-        }
-      ]
-    },
-    {
-      "id": 99,
-      "name": "Mateo",
-      "city": "Branson",
-      "age": 66,
-      "friends": [
-        {
-          "name": "Isabella",
-          "hobbies": [
-            "Television",
-            "Skiing & Snowboarding"
-          ]
-        },
-        {
-          "name": "Noah",
-          "hobbies": [
-            "Housework",
-            "Running",
-            "Podcasts"
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/jsonpointer-testdoc.json b/src/test/resources/jsonpointer-testdoc.json
deleted file mode 100644
index 657ccdd..0000000
--- a/src/test/resources/jsonpointer-testdoc.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"foo": 
-	[
-		"bar",
-		"baz"
-	],
-	"": 0,
-	"a/b": 1,
-	"c%d": 2,
-	"e^f": 3,
-	"g|h": 4,
-	"i\\j": 5,
-	"k\"l": 6,
-	" ": 7,
-	"m~n": 8,
-	"obj" : {
-		"key" : "value",
-		"other~key" : {
-			"another/key" : [
-				"val"
-			]
-		},
-		"" : {
-		    "" : "empty key of an object with an empty key",
-		    "subKey" : "Some other value"
-		}
-	}
-}
\ No newline at end of file