diff --git a/.copyrightconfig b/.copyrightconfig
index 25e785b7c..1782ce3dc 100644
--- a/.copyrightconfig
+++ b/.copyrightconfig
@@ -11,4 +11,4 @@ startyear: 2010
 #   - Dotfiles already skipped automatically
 # Enable by removing the leading '# ' from the next line and editing values.
 # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
-filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yaml, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, pom.xml, *.properties
+filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yaml, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, pom.xml, *.properties, *.json, *.xml
diff --git a/test-app/src/main/ml-config/databases/content-database.json b/test-app/src/main/ml-config/databases/content-database.json
index ec7a36f01..99b1c48c3 100644
--- a/test-app/src/main/ml-config/databases/content-database.json
+++ b/test-app/src/main/ml-config/databases/content-database.json
@@ -1,303 +1,303 @@
 {
-  "database-name": "java-unittest",
-  "schema-database": "java-unittest-schemas",
-  "triple-index": true,
-  "uri-lexicon": true,
-  "collection-lexicon": true,
-  "maintain-last-modified": true,
-  "range-element-index": [
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "",
-      "localname": "lastModified",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "http://marklogic.com/xdmp/property",
-      "localname": "last-modified",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "http://nwalsh.com/ns/photolib",
-      "localname": "tag",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "date",
-      "namespace-uri": "http://nwalsh.com/ns/photolib",
-      "localname": "date",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "double",
-      "namespace-uri": "",
-      "localname": "double",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "",
-      "localname": "int",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "grandchild",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "string",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "",
-      "localname": "system-start",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "",
-      "localname": "system-end",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "",
-      "localname": "valid-start",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "",
-      "localname": "valid-end",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "range-element-attribute-index": [
-    {
-      "scalar-type": "date",
-      "parent-namespace-uri": "http://nwalsh.com/ns/photolib",
-      "parent-localname": "view",
-      "namespace-uri": "",
-      "localname": "date",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "element-word-lexicon": [
-    {
-      "namespace-uri": "",
-      "localname": "suggest",
-      "collation": "http://marklogic.com/collation/"
-    }
-  ],
-  "path-namespace": [
-    {
-      "prefix": "rootOrg",
-      "namespace-uri": "root.org"
-    },
-    {
-      "prefix": "targetOrg",
-      "namespace-uri": "target.org"
-    }
-  ],
-  "range-path-index": [
-    {
-      "scalar-type": "long",
-      "path-expression": "com.marklogic.client.test.City/population",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "string",
-      "path-expression": "com.marklogic.client.test.City/alternateNames",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "string",
-      "path-expression": "com.marklogic.client.test.Country/continent",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "dateTime",
-      "path-expression": "com.marklogic.client.test.TimeTest/calendarTest",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "dateTime",
-      "path-expression": "com.marklogic.client.test.TimeTest/calendarTestCet",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "dateTime",
-      "path-expression": "com.marklogic.client.test.TimeTest/dateTest",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    }
-  ],
-  "field": [
-    {
-      "field-name": "",
-      "include-root": true
-    },
-    {
-      "field-name": "int1",
-      "include-root": false
-    },
-    {
-      "field-name": "int2",
-      "include-root": false
-    }
-  ],
-  "range-field-index": [
-    {
-      "scalar-type": "int",
-      "field-name": "int1",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "field-name": "int2",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-element-index": [
-    {
-      "namespace-uri": "",
-      "localname": "latLong",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-element-child-index": [
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "com.marklogic.client.test.City",
-      "namespace-uri": "",
-      "localname": "latLong",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-element-pair-index": [
-    {
-      "parent-namespace-uri": "http://marklogic.com/ns/test/places",
-      "parent-localname": "place",
-      "latitude-namespace-uri": "http://marklogic.com/ns/test/places",
-      "latitude-localname": "lat",
-      "longitude-namespace-uri": "http://marklogic.com/ns/test/places",
-      "longitude-localname": "long",
-      "coordinate-system": "wgs84",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "com.marklogic.client.test.City",
-      "latitude-namespace-uri": "",
-      "latitude-localname": "latitude",
-      "longitude-namespace-uri": "",
-      "longitude-localname": "longitude",
-      "coordinate-system": "wgs84",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "point",
-      "latitude-namespace-uri": "",
-      "latitude-localname": "lat",
-      "longitude-namespace-uri": "",
-      "longitude-localname": "lon",
-      "coordinate-system": "wgs84/double",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-path-index": [
-    {
-      "path-expression": "com.marklogic.client.test.City/latLong",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "path-expression": "/rootOrg:geo/targetOrg:path",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-region-path-index": [
-    {
-      "path-expression": "/country/region",
-      "coordinate-system": "wgs84",
-      "units": "miles",
-      "geohash-precision": 3,
-      "invalid-values": "ignore"
-    },
-    {
-      "path-expression": "/country/region",
-      "coordinate-system": "wgs84/double",
-      "units": "miles",
-      "geohash-precision": 3,
-      "invalid-values": "ignore"
-    }
-  ],
-  "default-ruleset": [
-    {
-      "location": "rdfs.rules"
-    }
-  ]
-}
\ No newline at end of file
+	"database-name": "java-unittest",
+	"schema-database": "java-unittest-schemas",
+	"triple-index": true,
+	"uri-lexicon": true,
+	"collection-lexicon": true,
+	"maintain-last-modified": true,
+	"range-element-index": [
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "",
+			"localname": "lastModified",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "http://marklogic.com/xdmp/property",
+			"localname": "last-modified",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "http://nwalsh.com/ns/photolib",
+			"localname": "tag",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "date",
+			"namespace-uri": "http://nwalsh.com/ns/photolib",
+			"localname": "date",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "double",
+			"namespace-uri": "",
+			"localname": "double",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "",
+			"localname": "int",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "grandchild",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "string",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "",
+			"localname": "system-start",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "",
+			"localname": "system-end",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "",
+			"localname": "valid-start",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "",
+			"localname": "valid-end",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"range-element-attribute-index": [
+		{
+			"scalar-type": "date",
+			"parent-namespace-uri": "http://nwalsh.com/ns/photolib",
+			"parent-localname": "view",
+			"namespace-uri": "",
+			"localname": "date",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"element-word-lexicon": [
+		{
+			"namespace-uri": "",
+			"localname": "suggest",
+			"collation": "http://marklogic.com/collation/"
+		}
+	],
+	"path-namespace": [
+		{
+			"prefix": "rootOrg",
+			"namespace-uri": "root.org"
+		},
+		{
+			"prefix": "targetOrg",
+			"namespace-uri": "target.org"
+		}
+	],
+	"range-path-index": [
+		{
+			"scalar-type": "long",
+			"path-expression": "com.marklogic.client.test.City/population",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "string",
+			"path-expression": "com.marklogic.client.test.City/alternateNames",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "string",
+			"path-expression": "com.marklogic.client.test.Country/continent",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "dateTime",
+			"path-expression": "com.marklogic.client.test.TimeTest/calendarTest",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "dateTime",
+			"path-expression": "com.marklogic.client.test.TimeTest/calendarTestCet",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "dateTime",
+			"path-expression": "com.marklogic.client.test.TimeTest/dateTest",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		}
+	],
+	"field": [
+		{
+			"field-name": "",
+			"include-root": true
+		},
+		{
+			"field-name": "int1",
+			"include-root": false
+		},
+		{
+			"field-name": "int2",
+			"include-root": false
+		}
+	],
+	"range-field-index": [
+		{
+			"scalar-type": "int",
+			"field-name": "int1",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"field-name": "int2",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-element-index": [
+		{
+			"namespace-uri": "",
+			"localname": "latLong",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-element-child-index": [
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "com.marklogic.client.test.City",
+			"namespace-uri": "",
+			"localname": "latLong",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-element-pair-index": [
+		{
+			"parent-namespace-uri": "http://marklogic.com/ns/test/places",
+			"parent-localname": "place",
+			"latitude-namespace-uri": "http://marklogic.com/ns/test/places",
+			"latitude-localname": "lat",
+			"longitude-namespace-uri": "http://marklogic.com/ns/test/places",
+			"longitude-localname": "long",
+			"coordinate-system": "wgs84",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "com.marklogic.client.test.City",
+			"latitude-namespace-uri": "",
+			"latitude-localname": "latitude",
+			"longitude-namespace-uri": "",
+			"longitude-localname": "longitude",
+			"coordinate-system": "wgs84",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "point",
+			"latitude-namespace-uri": "",
+			"latitude-localname": "lat",
+			"longitude-namespace-uri": "",
+			"longitude-localname": "lon",
+			"coordinate-system": "wgs84/double",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-path-index": [
+		{
+			"path-expression": "com.marklogic.client.test.City/latLong",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"path-expression": "/rootOrg:geo/targetOrg:path",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-region-path-index": [
+		{
+			"path-expression": "/country/region",
+			"coordinate-system": "wgs84",
+			"units": "miles",
+			"geohash-precision": 3,
+			"invalid-values": "ignore"
+		},
+		{
+			"path-expression": "/country/region",
+			"coordinate-system": "wgs84/double",
+			"units": "miles",
+			"geohash-precision": 3,
+			"invalid-values": "ignore"
+		}
+	],
+	"default-ruleset": [
+		{
+			"location": "rdfs.rules"
+		}
+	]
+}
diff --git a/test-app/src/main/ml-config/databases/func-content-database.json b/test-app/src/main/ml-config/databases/func-content-database.json
index 28b4ef38a..20417a0aa 100644
--- a/test-app/src/main/ml-config/databases/func-content-database.json
+++ b/test-app/src/main/ml-config/databases/func-content-database.json
@@ -1,213 +1,213 @@
 {
-  "database-name": "java-functest",
-  "schema-database": "java-functest-schemas",
-  "triple-index": true,
-  "uri-lexicon": true,
-  "collection-lexicon": true,
-  "maintain-last-modified": false,
-  "trailing-wildcard-searches": true,
-  "stemmed-searches": "basic",
-  "range-element-index": [
-    {
-      "scalar-type": "int",
-      "namespace-uri": "",
-      "localname": "srchNumber",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "date",
-      "namespace-uri": "",
-      "localname": "srchDate",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "",
-      "localname": "srchLevel",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "srchCity",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "http://action/",
-      "localname": "title",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "http://noun/",
-      "localname": "title",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "decimal",
-      "namespace-uri": "http://example.com",
-      "localname": "rating",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "http://example.com",
-      "localname": "scoville",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "date",
-      "namespace-uri": "http://purl.org/dc/elements/1.1/",
-      "localname": "date",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "city",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "decimal",
-      "namespace-uri": "http://test.aggr.com",
-      "localname": "score",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "http://test.tups.com",
-      "localname": "rate",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "title",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "",
-      "localname": "popularity",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "double",
-      "namespace-uri": "",
-      "localname": "distance",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "date",
-      "namespace-uri": "",
-      "localname": "date",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "namespace-uri": "",
-      "localname": "bday",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "",
-      "localname": "height1",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "date",
-      "namespace-uri": "",
-      "localname": "height2",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "cityName",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "cityTeam",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "long",
-      "namespace-uri": "",
-      "localname": "cityPopulation",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "long",
-      "namespace-uri": "",
-      "localname": "inventory",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "int",
-      "namespace-uri": "",
-      "localname": "id",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "string",
-      "namespace-uri": "",
-      "localname": "animal",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
+	"database-name": "java-functest",
+	"schema-database": "java-functest-schemas",
+	"triple-index": true,
+	"uri-lexicon": true,
+	"collection-lexicon": true,
+	"maintain-last-modified": false,
+	"trailing-wildcard-searches": true,
+	"stemmed-searches": "basic",
+	"range-element-index": [
+		{
+			"scalar-type": "int",
+			"namespace-uri": "",
+			"localname": "srchNumber",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "date",
+			"namespace-uri": "",
+			"localname": "srchDate",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "",
+			"localname": "srchLevel",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "srchCity",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "http://action/",
+			"localname": "title",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "http://noun/",
+			"localname": "title",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "decimal",
+			"namespace-uri": "http://example.com",
+			"localname": "rating",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "http://example.com",
+			"localname": "scoville",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "date",
+			"namespace-uri": "http://purl.org/dc/elements/1.1/",
+			"localname": "date",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "city",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "decimal",
+			"namespace-uri": "http://test.aggr.com",
+			"localname": "score",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "http://test.tups.com",
+			"localname": "rate",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "title",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "",
+			"localname": "popularity",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "double",
+			"namespace-uri": "",
+			"localname": "distance",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "date",
+			"namespace-uri": "",
+			"localname": "date",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"namespace-uri": "",
+			"localname": "bday",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "",
+			"localname": "height1",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "date",
+			"namespace-uri": "",
+			"localname": "height2",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "cityName",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "cityTeam",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "long",
+			"namespace-uri": "",
+			"localname": "cityPopulation",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "long",
+			"namespace-uri": "",
+			"localname": "inventory",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "int",
+			"namespace-uri": "",
+			"localname": "id",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "string",
+			"namespace-uri": "",
+			"localname": "animal",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
 		{
 			"scalar-type": "int",
 			"namespace-uri": "",
@@ -241,300 +241,300 @@
 			"invalid-values": "reject"
 		}
 	],
-  "element-word-lexicon": [
-    {
-      "namespace-uri": "",
-      "localname": "city",
-      "collation": "http://marklogic.com/collation/"
-    }
-  ],
-  "geospatial-element-index": [
-    {
-      "namespace-uri": "",
-      "localname": "latLonPoint",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "range-path-index": [
-    {
-      "scalar-type": "string",
-      "path-expression": "/Employee/fn",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "int",
-      "path-expression": "/root/popularity",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "decimal",
-      "path-expression": "//@amt",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "string",
-      "path-expression": "/doc/name",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "string",
-      "path-expression": "com.marklogic.client.functionaltest.Artifact/name",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "string",
-      "path-expression": "com.marklogic.client.functionaltest.Artifact/manufacturer/com.marklogic.client.functionaltest.Company/name",
-      "collation": "http://marklogic.com/collation/",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "scalar-type": "long",
-      "path-expression": "com.marklogic.client.functionaltest.Artifact/inventory",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "path-expression": "com.marklogic.client.functionaltest.ArtifactIndexedOnCalendar/expiryDate",
-      "collation": "",
-      "range-value-positions": true,
-      "invalid-values": "reject"
-    }
-  ],
-  "range-element-attribute-index": [
-    {
-      "scalar-type": "decimal",
-      "parent-namespace-uri": "http://cloudbank.com",
-      "parent-localname": "price",
-      "namespace-uri": "",
-      "localname": "amt",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "dateTime",
-      "parent-namespace-uri": "http://example.com",
-      "parent-localname": "entry",
-      "namespace-uri": "",
-      "localname": "date",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-path-index": [
-    {
-      "path-expression": "com.marklogic.client.functionaltest.GeoCompany/latlongPoint",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": "false",
-      "invalid-values": "ignore"
-    }
-  ],
-  "field": [
-    {
-      "field-name": "",
-      "include-root": true
-    },
-    {
-      "field-name": "pop",
-      "include-root": false,
-      "included-element": [
-        {
-          "namespace-uri": "",
-          "localname": "popularity",
-          "weight": 2,
-          "attribute-namespace-uri": "",
-          "attribute-localname": "",
-          "attribute-value": ""
-        }
-      ]
-    },
-    {
-      "field-name": "para",
-      "include-root": false,
-      "included-element": [
-        {
-          "namespace-uri": "",
-          "localname": "p",
-          "weight": 5,
-          "attribute-namespace-uri": "",
-          "attribute-localname": "",
-          "attribute-value": ""
-        }
-      ]
-    },
-    {
-      "field-name": "description",
-      "include-root": true,
-      "included-element": [
-        {
-          "namespace-uri": "",
-          "localname": "description",
-          "weight": 1,
-          "attribute-namespace-uri": "",
-          "attribute-localname": "",
-          "attribute-value": ""
-        }
-      ]
-    },
-    {
-      "field-name": "bbqtext",
-      "include-root": true,
-      "included-element": [
-        {
-          "namespace-uri": "http://example.com",
-          "localname": "title",
-          "weight": 1,
-          "attribute-namespace-uri": "",
-          "attribute-localname": "",
-          "attribute-value": ""
-        },
-        {
-          "namespace-uri": "http://example.com",
-          "localname": "abstract",
-          "weight": 1,
-          "attribute-namespace-uri": "",
-          "attribute-localname": "",
-          "attribute-value": ""
-        }
-      ]
-    }
-  ],
-  "geospatial-element-index": [
-    {
-      "namespace-uri": "",
-      "localname": "latLonPoint",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "namespace-uri": "",
-      "localname": "g-elem-point",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-element-child-index": [
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "g-elem-child-parent",
-      "namespace-uri": "",
-      "localname": "g-elem-child-point",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-element-pair-index": [
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "com.marklogic.client.functionaltest.GeoCompany",
-      "latitude-namespace-uri": "",
-      "latitude-localname": "latitude",
-      "longitude-namespace-uri": "",
-      "longitude-localname": "longitude",
-      "coordinate-system": "wgs84",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "g-elem-pair",
-      "latitude-namespace-uri": "",
-      "latitude-localname": "lat",
-      "longitude-namespace-uri": "",
-      "longitude-localname": "long",
-      "coordinate-system": "wgs84",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-element-attribute-pair-index": [
-    {
-      "parent-namespace-uri": "",
-      "parent-localname": "g-attr-pair",
-      "latitude-namespace-uri": "",
-      "latitude-localname": "lat",
-      "longitude-namespace-uri": "",
-      "longitude-localname": "long",
-      "coordinate-system": "wgs84",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    }
-  ],
-  "geospatial-path-index": [
-    {
-      "path-expression": "com.marklogic.client.functionaltest.GeoCompany/latlongPoint",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    },
-    {
-      "path-expression": "/doc/g-elem-point",
-      "coordinate-system": "wgs84",
-      "point-format": "point",
-      "range-value-positions": false,
-      "invalid-values": "ignore"
-    }
-  ],
-  "geospatial-region-path-index": [
-    {
-      "path-expression": "/root/item/linestring",
-      "coordinate-system": "wgs84/double",
-      "units": "miles",
-      "geohash-precision": 2,
-      "invalid-values": "reject"
-    },
-    {
-      "path-expression": "/root/item/point",
-      "coordinate-system": "wgs84",
-      "units": "miles",
-      "geohash-precision": 2,
-      "invalid-values": "reject"
-    },
-    {
-      "path-expression": "/root/item/circle",
-      "coordinate-system": "wgs84/double",
-      "units": "miles",
-      "geohash-precision": 2,
-      "invalid-values": "reject"
-    },
-    {
-      "path-expression": "/root/item/box",
-      "coordinate-system": "wgs84/double",
-      "units": "miles",
-      "geohash-precision": 2,
-      "invalid-values": "reject"
-    },
-    {
-      "path-expression": "/root/item/polygon",
-      "coordinate-system": "wgs84",
-      "units": "miles",
-      "geohash-precision": 3,
-      "invalid-values": "reject"
-    }
-  ]
+	"element-word-lexicon": [
+		{
+			"namespace-uri": "",
+			"localname": "city",
+			"collation": "http://marklogic.com/collation/"
+		}
+	],
+	"geospatial-element-index": [
+		{
+			"namespace-uri": "",
+			"localname": "latLonPoint",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"range-path-index": [
+		{
+			"scalar-type": "string",
+			"path-expression": "/Employee/fn",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "int",
+			"path-expression": "/root/popularity",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "decimal",
+			"path-expression": "//@amt",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "string",
+			"path-expression": "/doc/name",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "string",
+			"path-expression": "com.marklogic.client.functionaltest.Artifact/name",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "string",
+			"path-expression": "com.marklogic.client.functionaltest.Artifact/manufacturer/com.marklogic.client.functionaltest.Company/name",
+			"collation": "http://marklogic.com/collation/",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"scalar-type": "long",
+			"path-expression": "com.marklogic.client.functionaltest.Artifact/inventory",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"path-expression": "com.marklogic.client.functionaltest.ArtifactIndexedOnCalendar/expiryDate",
+			"collation": "",
+			"range-value-positions": true,
+			"invalid-values": "reject"
+		}
+	],
+	"range-element-attribute-index": [
+		{
+			"scalar-type": "decimal",
+			"parent-namespace-uri": "http://cloudbank.com",
+			"parent-localname": "price",
+			"namespace-uri": "",
+			"localname": "amt",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"scalar-type": "dateTime",
+			"parent-namespace-uri": "http://example.com",
+			"parent-localname": "entry",
+			"namespace-uri": "",
+			"localname": "date",
+			"collation": "",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-path-index": [
+		{
+			"path-expression": "com.marklogic.client.functionaltest.GeoCompany/latlongPoint",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": "false",
+			"invalid-values": "ignore"
+		}
+	],
+	"field": [
+		{
+			"field-name": "",
+			"include-root": true
+		},
+		{
+			"field-name": "pop",
+			"include-root": false,
+			"included-element": [
+				{
+					"namespace-uri": "",
+					"localname": "popularity",
+					"weight": 2,
+					"attribute-namespace-uri": "",
+					"attribute-localname": "",
+					"attribute-value": ""
+				}
+			]
+		},
+		{
+			"field-name": "para",
+			"include-root": false,
+			"included-element": [
+				{
+					"namespace-uri": "",
+					"localname": "p",
+					"weight": 5,
+					"attribute-namespace-uri": "",
+					"attribute-localname": "",
+					"attribute-value": ""
+				}
+			]
+		},
+		{
+			"field-name": "description",
+			"include-root": true,
+			"included-element": [
+				{
+					"namespace-uri": "",
+					"localname": "description",
+					"weight": 1,
+					"attribute-namespace-uri": "",
+					"attribute-localname": "",
+					"attribute-value": ""
+				}
+			]
+		},
+		{
+			"field-name": "bbqtext",
+			"include-root": true,
+			"included-element": [
+				{
+					"namespace-uri": "http://example.com",
+					"localname": "title",
+					"weight": 1,
+					"attribute-namespace-uri": "",
+					"attribute-localname": "",
+					"attribute-value": ""
+				},
+				{
+					"namespace-uri": "http://example.com",
+					"localname": "abstract",
+					"weight": 1,
+					"attribute-namespace-uri": "",
+					"attribute-localname": "",
+					"attribute-value": ""
+				}
+			]
+		}
+	],
+	"geospatial-element-index": [
+		{
+			"namespace-uri": "",
+			"localname": "latLonPoint",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		},
+		{
+			"namespace-uri": "",
+			"localname": "g-elem-point",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-element-child-index": [
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "g-elem-child-parent",
+			"namespace-uri": "",
+			"localname": "g-elem-child-point",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-element-pair-index": [
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "com.marklogic.client.functionaltest.GeoCompany",
+			"latitude-namespace-uri": "",
+			"latitude-localname": "latitude",
+			"longitude-namespace-uri": "",
+			"longitude-localname": "longitude",
+			"coordinate-system": "wgs84",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "g-elem-pair",
+			"latitude-namespace-uri": "",
+			"latitude-localname": "lat",
+			"longitude-namespace-uri": "",
+			"longitude-localname": "long",
+			"coordinate-system": "wgs84",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-element-attribute-pair-index": [
+		{
+			"parent-namespace-uri": "",
+			"parent-localname": "g-attr-pair",
+			"latitude-namespace-uri": "",
+			"latitude-localname": "lat",
+			"longitude-namespace-uri": "",
+			"longitude-localname": "long",
+			"coordinate-system": "wgs84",
+			"range-value-positions": false,
+			"invalid-values": "reject"
+		}
+	],
+	"geospatial-path-index": [
+		{
+			"path-expression": "com.marklogic.client.functionaltest.GeoCompany/latlongPoint",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		},
+		{
+			"path-expression": "/doc/g-elem-point",
+			"coordinate-system": "wgs84",
+			"point-format": "point",
+			"range-value-positions": false,
+			"invalid-values": "ignore"
+		}
+	],
+	"geospatial-region-path-index": [
+		{
+			"path-expression": "/root/item/linestring",
+			"coordinate-system": "wgs84/double",
+			"units": "miles",
+			"geohash-precision": 2,
+			"invalid-values": "reject"
+		},
+		{
+			"path-expression": "/root/item/point",
+			"coordinate-system": "wgs84",
+			"units": "miles",
+			"geohash-precision": 2,
+			"invalid-values": "reject"
+		},
+		{
+			"path-expression": "/root/item/circle",
+			"coordinate-system": "wgs84/double",
+			"units": "miles",
+			"geohash-precision": 2,
+			"invalid-values": "reject"
+		},
+		{
+			"path-expression": "/root/item/box",
+			"coordinate-system": "wgs84/double",
+			"units": "miles",
+			"geohash-precision": 2,
+			"invalid-values": "reject"
+		},
+		{
+			"path-expression": "/root/item/polygon",
+			"coordinate-system": "wgs84",
+			"units": "miles",
+			"geohash-precision": 3,
+			"invalid-values": "reject"
+		}
+	]
 }
diff --git a/test-app/src/main/ml-config/databases/func-schemas-database.json b/test-app/src/main/ml-config/databases/func-schemas-database.json
index 50c471e93..5a694f552 100644
--- a/test-app/src/main/ml-config/databases/func-schemas-database.json
+++ b/test-app/src/main/ml-config/databases/func-schemas-database.json
@@ -1,3 +1,3 @@
 {
-  "database-name": "java-functest-schemas"
-}
\ No newline at end of file
+	"database-name": "java-functest-schemas"
+}
diff --git a/test-app/src/main/ml-config/databases/modules-database.json b/test-app/src/main/ml-config/databases/modules-database.json
index 35657f4da..3d747b864 100644
--- a/test-app/src/main/ml-config/databases/modules-database.json
+++ b/test-app/src/main/ml-config/databases/modules-database.json
@@ -1,3 +1,3 @@
 {
-  "database-name": "%%MODULES_DATABASE%%"
-}
\ No newline at end of file
+	"database-name": "%%MODULES_DATABASE%%"
+}
diff --git a/test-app/src/main/ml-config/databases/schemas-database.json b/test-app/src/main/ml-config/databases/schemas-database.json
index f0f14c748..582808531 100644
--- a/test-app/src/main/ml-config/databases/schemas-database.json
+++ b/test-app/src/main/ml-config/databases/schemas-database.json
@@ -1,3 +1,3 @@
 {
-  "database-name": "%%SCHEMAS_DATABASE%%"
-}
\ No newline at end of file
+	"database-name": "%%SCHEMAS_DATABASE%%"
+}