diff --git a/pom.xml b/pom.xml
index 1de698e6b6..efffc9e1a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,9 +86,12 @@
                             <mainClass>org.rumbledb.cli.Main</mainClass>
                         </manifest>
                     </archive>
-                    <descriptorRefs>
+                    <!-- <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
+                    </descriptorRefs> -->
+                    <descriptors>
+                        <descriptor>src/assembly/custom-jar-with-dependencies-assembly.xml</descriptor>
+                    </descriptors>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/assembly/custom-jar-with-dependencies-assembly.xml b/src/assembly/custom-jar-with-dependencies-assembly.xml
new file mode 100644
index 0000000000..e65e6f488a
--- /dev/null
+++ b/src/assembly/custom-jar-with-dependencies-assembly.xml
@@ -0,0 +1,33 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+                <include>pom.xml</include>
+            </includes>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main</directory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile2.jq b/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile2.jq
deleted file mode 100644
index b44cbefde7..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile2.jq
+++ /dev/null
@@ -1,5 +0,0 @@
-(:JIQS: ShouldRun; Output="(Amanda, Albert)" :)
-avro-file("src/main/resources/queries/userdata1-limit.avro", {ignoreExtension: false}).first_name[1],
-avro-file("src/main/resources/queries/userdata1-limit.avro", {ignoreExtension: true}).first_name[2]
-
-(: add ignoreExtension option :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile3.jq b/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile3.jq
deleted file mode 100644
index 3c64cc68e3..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile3.jq
+++ /dev/null
@@ -1,5 +0,0 @@
-(:JIQS: ShouldRun; Output="(Amanda, Albert)" :)
-avro-file("src/main/resources/queries/userdata1-limit.avro", {}).first_name[1],
-avro-file("src/main/resources/queries/userdata1-limit.avro", {irrelevant: "foo"}).first_name[2]
-
-(: empty object and invalid option (should be ignored) :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError5.jq b/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError5.jq
deleted file mode 100644
index f9e4a28131..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError5.jq
+++ /dev/null
@@ -1,4 +0,0 @@
-(:JIQS: ShouldCrash; ErrorCode="FODC0002"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-avro-file("src/main/resources/queries/userdata1.avro", {"avroSchema": "src/main/resources/queries/userdata-wrong.avsc"})
-
-(: wrong path in schema file :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile2.jq b/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile2.jq
deleted file mode 100644
index a6b54290d3..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile2.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="131" :)
-count(csv-file("./src/main/resources/queries/cities*.csv"))
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile3.jq b/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile3.jq
deleted file mode 100644
index 959abf38a1..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile3.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="41" :)
-head(csv-file("./src/main/resources/queries/cities.csv", {header: true}).LatD)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile4.jq b/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile4.jq
deleted file mode 100644
index a0351c8b15..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile4.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="true" :)
-head(csv-file("./src/main/resources/queries/cities.csv", {header: true, "inferSchema": true}).LatD) instance of integer
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileEmpty.jq b/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileEmpty.jq
deleted file mode 100644
index 72e2789086..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileEmpty.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-csv-file("./src/main/resources/queries/confusion_sample_empty.json")
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileError2.jq b/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileError2.jq
deleted file mode 100644
index aa46e10d10..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileError2.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldCrash; ErrorCode="XPTY0004":)
-csv-file("./src/main/resources/queries/cities.csv", {"header": [true]})
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/JsonFileEmpty.jq b/src/main/resources/test_files/runtime-spark/FileInputs/JsonFileEmpty.jq
deleted file mode 100644
index c38ae2fa20..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/JsonFileEmpty.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-json-file("./src/main/resources/queries/emptyFile.txt", 10)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-Malformed1.jq b/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-Malformed1.jq
deleted file mode 100644
index 9a66bb6d6d..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-Malformed1.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldCrash; ErrorCode="XPDY0130"; ErrorMetadata="LINE:2;COLUMN:0;"  :)
-structured-json-file("./src/main/resources/queries/SpreadOverMultipleLinesDocument.json")
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFileEmpty.jq b/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFileEmpty.jq
deleted file mode 100644
index 30fa7c3303..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFileEmpty.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-structured-json-file("./src/main/resources/queries/emptyFile.txt")
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/TextFile.jq b/src/main/resources/test_files/runtime-spark/FileInputs/TextFile.jq
deleted file mode 100644
index c46f5c5d0b..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/TextFile.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="(foo, bar, foobar)" :)
-text-file("./src/main/resources/queries/file.txt", 10)
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/TextFile2.jq b/src/main/resources/test_files/runtime-spark/FileInputs/TextFile2.jq
deleted file mode 100644
index 3c1951512e..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/TextFile2.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="(foo, bar, foobar)" :)
-text-file("./src/main/resources/queries/file.txt")
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/TextFileEmpty.jq b/src/main/resources/test_files/runtime-spark/FileInputs/TextFileEmpty.jq
deleted file mode 100644
index b2cd48841b..0000000000
--- a/src/main/resources/test_files/runtime-spark/FileInputs/TextFileEmpty.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-text-file("./src/main/resources/queries/emptyFile.txt", 10)
diff --git a/src/main/resources/test_files/runtime-spark/FunctionSequence/FunctionCountDF.jq b/src/main/resources/test_files/runtime-spark/FunctionSequence/FunctionCountDF.jq
deleted file mode 100644
index 4562c734c0..0000000000
--- a/src/main/resources/test_files/runtime-spark/FunctionSequence/FunctionCountDF.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="(500, 0)" :)
-count(json-file("./src/main/resources/queries/confusion_sample.json")),
-count(json-file("./src/main/resources/queries/confusion_sample_empty.json"))
diff --git a/src/main/resources/test_files/runtime-spark/FunctionSequence/FunctionCountRDD.jq b/src/main/resources/test_files/runtime-spark/FunctionSequence/FunctionCountRDD.jq
deleted file mode 100644
index 74d909e353..0000000000
--- a/src/main/resources/test_files/runtime-spark/FunctionSequence/FunctionCountRDD.jq
+++ /dev/null
@@ -1,5 +0,0 @@
-(:JIQS: ShouldRun; Output="(500, 0, 1)" :)
-count(structured-json-file("./src/main/resources/queries/confusion_sample.json")),
-count(structured-json-file("./src/main/resources/queries/confusion_sample_empty.json")),
-count(parquet-file("./src/main/resources/queries/sample-json.snappy.parquet"))
-
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError3.jq b/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError3.jq
deleted file mode 100644
index 605c1bd8a8..0000000000
--- a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError3.jq
+++ /dev/null
@@ -1,7 +0,0 @@
-(:JIQS: ShouldCrash; ErrorCode="RBST0003"; ErrorMetadata="LINE:3:COLUMN:4:" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
-let $j := for $k in json-file("./src/main/resources/queries/conf-ex.json")
-          return $k.target
-return $j
-
-(: Job within job :)
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup6.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup6.jq
deleted file mode 100644
index 7f2e953247..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup6.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="(test2, test5)" :)
-structured-json-file("./src/main/resources/queries/nested.json").foobar.foo[[2]]
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup8.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup8.jq
deleted file mode 100644
index 90d99ed65b..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup8.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-structured-json-file("./src/main/resources/queries/nested.json").foobar[[2]]
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing3.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing3.jq
deleted file mode 100644
index ca8e03501f..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing3.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="(test1, test2, test4, test5)" :)
-structured-json-file("./src/main/resources/queries/nested.json").foobar.foo[]
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing4.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing4.jq
deleted file mode 100644
index dea32efa27..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing4.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-structured-json-file("./src/main/resources/queries/nested.json").foobar[]
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing5.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing5.jq
deleted file mode 100644
index 6f7b686fcc..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing5.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-structured-json-file("./src/main/resources/queries/nested.json").foo[]
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF2.jq b/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF2.jq
deleted file mode 100644
index 84be066c90..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF2.jq
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-keys(keys(structured-json-file("./src/main/resources/queries/conf-ex.json")))
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF3.jq b/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF3.jq
deleted file mode 100644
index 8a733941f6..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF3.jq
+++ /dev/null
@@ -1,4 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-for $k in keys(keys(structured-json-file("./src/main/resources/queries/conf-ex.json")))
-group by $k
-return $k
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup4.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup4.jq
deleted file mode 100644
index 1e2d58b589..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup4.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="(1, 2)" :)
-structured-json-file("./src/main/resources/queries/nested.json").foo
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup6.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup6.jq
deleted file mode 100644
index 8dc3e844bf..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup6.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="([ "test1", "test2" ], [ "test4", "test5" ])" :)
-structured-json-file("./src/main/resources/queries/nested.json").foobar.foo
-
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup7.jq b/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup7.jq
deleted file mode 100644
index a9999bb42c..0000000000
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup7.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-structured-json-file("./src/main/resources/queries/nested.json").foob
-
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionJsonDoc.jq.deactivated b/src/main/resources/test_files/runtime/FunctionObject/FunctionJsonDoc.jq.deactivated
deleted file mode 100644
index 5c630b7aa8..0000000000
--- a/src/main/resources/test_files/runtime/FunctionObject/FunctionJsonDoc.jq.deactivated
+++ /dev/null
@@ -1,2 +0,0 @@
-(:JIQS: ShouldRun; Output="test1" :)
-json-doc("./src/main/resources/queries/SpreadOverMultipleLinesDocument.json").foobar[[1]]
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD1.jq b/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD1.jq
deleted file mode 100644
index 911a19b86c..0000000000
--- a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD1.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="2013-08-20" :)
-
-max(for $o in json-file("./src/main/resources/queries/conf-ex.json") return $o.date)
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD2.jq b/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD2.jq
deleted file mode 100644
index fd89dbb9b7..0000000000
--- a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD2.jq
+++ /dev/null
@@ -1,6 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-
-max(for $o in json-file("./src/main/resources/queries/confusion_sample_empty.json") return $o.date)
-
-(: empty file :)
-
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD1.jq b/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD1.jq
deleted file mode 100644
index 9f388d795b..0000000000
--- a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD1.jq
+++ /dev/null
@@ -1,3 +0,0 @@
-(:JIQS: ShouldRun; Output="2013-08-20" :)
-
-min(for $o in json-file("./src/main/resources/queries/conf-ex.json") return $o.date)
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD2.jq b/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD2.jq
deleted file mode 100644
index 7b1ad3321d..0000000000
--- a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD2.jq
+++ /dev/null
@@ -1,6 +0,0 @@
-(:JIQS: ShouldRun; Output="" :)
-
-min(for $o in json-file("./src/main/resources/queries/confusion_sample_empty.json") return $o.date)
-
-(: empty file :)
-
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDD1.jq b/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDD1.jq
deleted file mode 100644
index 413855cf71..0000000000
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDD1.jq
+++ /dev/null
@@ -1,4 +0,0 @@
-(:JIQS: ShouldRun; Output="{ "foo" : 1, "bar" : null, "foobar" : [ "test1", "test2" ] }" :)
-zero-or-one(json-file("./src/main/resources/queries/emptyFile.txt")),
-zero-or-one(json-file("./src/main/resources/queries/singleLine.json"))
-
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual11.jq b/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual11.jq
deleted file mode 100644
index 69f281578b..0000000000
--- a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual11.jq
+++ /dev/null
@@ -1,9 +0,0 @@
-(:JIQS: ShouldRun; Output="(false, false, true, true, false, true)" :)
-deep-equal(csv-file("./src/main/resources/queries/cities.csv"), json-file("./src/main/resources/queries/conf-ex.json", 10)),
-deep-equal(json-file("./src/main/resources/queries/conf-ex.json", 10), csv-file("./src/main/resources/queries/cities.csv")),
-deep-equal(json-file("./src/main/resources/queries/conf-ex.json", 4), json-file("./src/main/resources/queries/conf-ex.json", 5)),
-deep-equal(json-file("./src/main/resources/queries/conf-ex.json", 5), json-file("./src/main/resources/queries/conf-ex.json", 4)),
-deep-equal(parallelize((1, 2, 3, 4, 5), 2), parallelize((1, 2, 3, 4, 5, 6), 2)),
-deep-equal(parallelize(1 to 10000, 2), parallelize(1 to 10000, 20))
-
-(: parallelized inputs with varying partition sizes :)
diff --git a/src/test/java/iq/FrontendTests.java b/src/test/java/iq/FrontendTests.java
index dd2b82c1f5..4eabaa9d6b 100644
--- a/src/test/java/iq/FrontendTests.java
+++ b/src/test/java/iq/FrontendTests.java
@@ -38,17 +38,17 @@ public class FrontendTests extends AnnotationsTestsBase {
     public static final File grammarTestsDirectory = new File(
             System.getProperty("user.dir")
                 +
-                "/src/main/resources/test_files/parser"
+                "/src/test/resources/test_files/parser"
     );
     public static final File astTestsDirectory = new File(
             System.getProperty("user.dir")
                 +
-                "/src/main/resources/test_files/ast"
+                "/src/test/resources/test_files/ast"
     );
     public static final File semanticTestsDirectory = new File(
             System.getProperty("user.dir")
                 +
-                "/src/main/resources/test_files/semantics"
+                "/src/test/resources/test_files/semantics"
     );
     public static final String[] manualSemanticChecksFiles = new String[] { "TypesCheck.jq" };
 
diff --git a/src/test/java/iq/RuntimeTests.java b/src/test/java/iq/RuntimeTests.java
index 2504036da8..27eeaa7947 100644
--- a/src/test/java/iq/RuntimeTests.java
+++ b/src/test/java/iq/RuntimeTests.java
@@ -48,7 +48,7 @@ public class RuntimeTests extends AnnotationsTestsBase {
     public static final File runtimeTestsDirectory = new File(
             System.getProperty("user.dir")
                 +
-                "/src/main/resources/test_files/runtime"
+                "/src/test/resources/test_files/runtime"
     );
     public static final String javaVersion =
         System.getProperty("java.version");
diff --git a/src/test/java/iq/SparkRuntimeTests.java b/src/test/java/iq/SparkRuntimeTests.java
index 8e60a35de4..79a56e1712 100644
--- a/src/test/java/iq/SparkRuntimeTests.java
+++ b/src/test/java/iq/SparkRuntimeTests.java
@@ -37,7 +37,7 @@ public class SparkRuntimeTests extends RuntimeTests {
     public static final File sparkRuntimeTestsDirectory = new File(
             System.getProperty("user.dir")
                 +
-                "/src/main/resources/test_files/runtime-spark"
+                "/src/test/resources/test_files/runtime-spark"
     );
 
     public SparkRuntimeTests(File testFile) {
diff --git a/src/main/resources/queries/Reddit.json b/src/test/resources/test_data/Reddit.json
similarity index 100%
rename from src/main/resources/queries/Reddit.json
rename to src/test/resources/test_data/Reddit.json
diff --git a/src/main/resources/queries/SpreadOverMultipleLinesDocument.json b/src/test/resources/test_data/SpreadOverMultipleLinesDocument.json
similarity index 100%
rename from src/main/resources/queries/SpreadOverMultipleLinesDocument.json
rename to src/test/resources/test_data/SpreadOverMultipleLinesDocument.json
diff --git a/src/main/resources/queries/cities-ex.csv b/src/test/resources/test_data/cities-ex.csv
similarity index 100%
rename from src/main/resources/queries/cities-ex.csv
rename to src/test/resources/test_data/cities-ex.csv
diff --git a/src/main/resources/queries/cities.csv b/src/test/resources/test_data/cities.csv
similarity index 100%
rename from src/main/resources/queries/cities.csv
rename to src/test/resources/test_data/cities.csv
diff --git a/src/main/resources/queries/conf-ex.json b/src/test/resources/test_data/conf-ex.json
similarity index 100%
rename from src/main/resources/queries/conf-ex.json
rename to src/test/resources/test_data/conf-ex.json
diff --git a/src/main/resources/queries/confusion_sample.json b/src/test/resources/test_data/confusion_sample.json
similarity index 100%
rename from src/main/resources/queries/confusion_sample.json
rename to src/test/resources/test_data/confusion_sample.json
diff --git a/src/main/resources/queries/confusion_sample_empty.json b/src/test/resources/test_data/confusion_sample_empty.json
similarity index 100%
rename from src/main/resources/queries/confusion_sample_empty.json
rename to src/test/resources/test_data/confusion_sample_empty.json
diff --git a/src/main/resources/queries/emptyFile.txt b/src/test/resources/test_data/emptyFile.txt
similarity index 100%
rename from src/main/resources/queries/emptyFile.txt
rename to src/test/resources/test_data/emptyFile.txt
diff --git a/src/main/resources/queries/file.txt b/src/test/resources/test_data/file.txt
similarity index 100%
rename from src/main/resources/queries/file.txt
rename to src/test/resources/test_data/file.txt
diff --git a/src/main/resources/queries/multiLine.json b/src/test/resources/test_data/multiLine.json
similarity index 100%
rename from src/main/resources/queries/multiLine.json
rename to src/test/resources/test_data/multiLine.json
diff --git a/src/main/resources/queries/nested.json b/src/test/resources/test_data/nested.json
similarity index 100%
rename from src/main/resources/queries/nested.json
rename to src/test/resources/test_data/nested.json
diff --git a/src/main/resources/queries/quotes.json b/src/test/resources/test_data/quotes.json
similarity index 100%
rename from src/main/resources/queries/quotes.json
rename to src/test/resources/test_data/quotes.json
diff --git a/src/main/resources/queries/rumbleML/sample-libsvm-data-kmeans.txt b/src/test/resources/test_data/rumbleML/sample-libsvm-data-kmeans.txt
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-libsvm-data-kmeans.txt
rename to src/test/resources/test_data/rumbleML/sample-libsvm-data-kmeans.txt
diff --git a/src/main/resources/queries/rumbleML/sample-libsvm-data-multiclass-classification.txt b/src/test/resources/test_data/rumbleML/sample-libsvm-data-multiclass-classification.txt
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-libsvm-data-multiclass-classification.txt
rename to src/test/resources/test_data/rumbleML/sample-libsvm-data-multiclass-classification.txt
diff --git a/src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt b/src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt
rename to src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt
diff --git a/src/main/resources/queries/rumbleML/sample-libsvm-data.txt b/src/test/resources/test_data/rumbleML/sample-libsvm-data.txt
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-libsvm-data.txt
rename to src/test/resources/test_data/rumbleML/sample-libsvm-data.txt
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json b/src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-flat.json b/src/test/resources/test_data/rumbleML/sample-ml-data-flat.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-flat.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-flat.json
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-nested.json b/src/test/resources/test_data/rumbleML/sample-ml-data-nested.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-nested.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-nested.json
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-nested2.json b/src/test/resources/test_data/rumbleML/sample-ml-data-nested2.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-nested2.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-nested2.json
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-nested3.json b/src/test/resources/test_data/rumbleML/sample-ml-data-nested3.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-nested3.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-nested3.json
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-numeric-array.json b/src/test/resources/test_data/rumbleML/sample-ml-data-numeric-array.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-numeric-array.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-numeric-array.json
diff --git a/src/main/resources/queries/rumbleML/sample-ml-data-sentence.json b/src/test/resources/test_data/rumbleML/sample-ml-data-sentence.json
similarity index 100%
rename from src/main/resources/queries/rumbleML/sample-ml-data-sentence.json
rename to src/test/resources/test_data/rumbleML/sample-ml-data-sentence.json
diff --git a/src/main/resources/queries/runQuery.iq b/src/test/resources/test_data/runQuery.iq
similarity index 100%
rename from src/main/resources/queries/runQuery.iq
rename to src/test/resources/test_data/runQuery.iq
diff --git a/src/main/resources/queries/sample-json.snappy.parquet b/src/test/resources/test_data/sample-json.snappy.parquet
similarity index 100%
rename from src/main/resources/queries/sample-json.snappy.parquet
rename to src/test/resources/test_data/sample-json.snappy.parquet
diff --git a/src/main/resources/queries/singleLine.json b/src/test/resources/test_data/singleLine.json
similarity index 100%
rename from src/main/resources/queries/singleLine.json
rename to src/test/resources/test_data/singleLine.json
diff --git a/src/main/resources/queries/userdata.avsc b/src/test/resources/test_data/userdata.avsc
similarity index 100%
rename from src/main/resources/queries/userdata.avsc
rename to src/test/resources/test_data/userdata.avsc
diff --git a/src/main/resources/queries/userdata1-limit.avro b/src/test/resources/test_data/userdata1-limit.avro
similarity index 100%
rename from src/main/resources/queries/userdata1-limit.avro
rename to src/test/resources/test_data/userdata1-limit.avro
diff --git a/src/main/resources/test_files/ast/FunctionCallFlowr.jq b/src/test/resources/test_files/ast/FunctionCallFlowr.jq
similarity index 100%
rename from src/main/resources/test_files/ast/FunctionCallFlowr.jq
rename to src/test/resources/test_files/ast/FunctionCallFlowr.jq
diff --git a/src/main/resources/test_files/ast/IfExpr.jq b/src/test/resources/test_files/ast/IfExpr.jq
similarity index 100%
rename from src/main/resources/test_files/ast/IfExpr.jq
rename to src/test/resources/test_files/ast/IfExpr.jq
diff --git a/src/main/resources/test_files/ast/ManualFlowr.jq b/src/test/resources/test_files/ast/ManualFlowr.jq
similarity index 100%
rename from src/main/resources/test_files/ast/ManualFlowr.jq
rename to src/test/resources/test_files/ast/ManualFlowr.jq
diff --git a/src/main/resources/test_files/ast/ManualOrExpression.jq b/src/test/resources/test_files/ast/ManualOrExpression.jq
similarity index 100%
rename from src/main/resources/test_files/ast/ManualOrExpression.jq
rename to src/test/resources/test_files/ast/ManualOrExpression.jq
diff --git a/src/main/resources/test_files/ast/Nests.jq b/src/test/resources/test_files/ast/Nests.jq
similarity index 100%
rename from src/main/resources/test_files/ast/Nests.jq
rename to src/test/resources/test_files/ast/Nests.jq
diff --git a/src/main/resources/test_files/ast/ObjectCtor.jq b/src/test/resources/test_files/ast/ObjectCtor.jq
similarity index 100%
rename from src/main/resources/test_files/ast/ObjectCtor.jq
rename to src/test/resources/test_files/ast/ObjectCtor.jq
diff --git a/src/main/resources/test_files/parser/Arithmetic.jq b/src/test/resources/test_files/parser/Arithmetic.jq
similarity index 100%
rename from src/main/resources/test_files/parser/Arithmetic.jq
rename to src/test/resources/test_files/parser/Arithmetic.jq
diff --git a/src/main/resources/test_files/parser/Context.jq b/src/test/resources/test_files/parser/Context.jq
similarity index 100%
rename from src/main/resources/test_files/parser/Context.jq
rename to src/test/resources/test_files/parser/Context.jq
diff --git a/src/main/resources/test_files/parser/ErrorNests.jq b/src/test/resources/test_files/parser/ErrorNests.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ErrorNests.jq
rename to src/test/resources/test_files/parser/ErrorNests.jq
diff --git a/src/main/resources/test_files/parser/ErrorNoReturnFlowr.jq b/src/test/resources/test_files/parser/ErrorNoReturnFlowr.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ErrorNoReturnFlowr.jq
rename to src/test/resources/test_files/parser/ErrorNoReturnFlowr.jq
diff --git a/src/main/resources/test_files/parser/ErrorWrongIf.jq b/src/test/resources/test_files/parser/ErrorWrongIf.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ErrorWrongIf.jq
rename to src/test/resources/test_files/parser/ErrorWrongIf.jq
diff --git a/src/main/resources/test_files/parser/ErrorWrongJson1.jq b/src/test/resources/test_files/parser/ErrorWrongJson1.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ErrorWrongJson1.jq
rename to src/test/resources/test_files/parser/ErrorWrongJson1.jq
diff --git a/src/main/resources/test_files/parser/ErrorWrongJson2.jq b/src/test/resources/test_files/parser/ErrorWrongJson2.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ErrorWrongJson2.jq
rename to src/test/resources/test_files/parser/ErrorWrongJson2.jq
diff --git a/src/main/resources/test_files/parser/ErrorWrongKeyword.jq b/src/test/resources/test_files/parser/ErrorWrongKeyword.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ErrorWrongKeyword.jq
rename to src/test/resources/test_files/parser/ErrorWrongKeyword.jq
diff --git a/src/main/resources/test_files/parser/ForArrayConstructor.jq b/src/test/resources/test_files/parser/ForArrayConstructor.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ForArrayConstructor.jq
rename to src/test/resources/test_files/parser/ForArrayConstructor.jq
diff --git a/src/main/resources/test_files/parser/ForClause.jq b/src/test/resources/test_files/parser/ForClause.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ForClause.jq
rename to src/test/resources/test_files/parser/ForClause.jq
diff --git a/src/main/resources/test_files/parser/IfExpr.jq b/src/test/resources/test_files/parser/IfExpr.jq
similarity index 100%
rename from src/main/resources/test_files/parser/IfExpr.jq
rename to src/test/resources/test_files/parser/IfExpr.jq
diff --git a/src/main/resources/test_files/parser/LetJoin.jq b/src/test/resources/test_files/parser/LetJoin.jq
similarity index 100%
rename from src/main/resources/test_files/parser/LetJoin.jq
rename to src/test/resources/test_files/parser/LetJoin.jq
diff --git a/src/main/resources/test_files/parser/ObjectConstruction.jq b/src/test/resources/test_files/parser/ObjectConstruction.jq
similarity index 100%
rename from src/main/resources/test_files/parser/ObjectConstruction.jq
rename to src/test/resources/test_files/parser/ObjectConstruction.jq
diff --git a/src/main/resources/test_files/parser/UnquotedObjectLookup.jq b/src/test/resources/test_files/parser/UnquotedObjectLookup.jq
similarity index 100%
rename from src/main/resources/test_files/parser/UnquotedObjectLookup.jq
rename to src/test/resources/test_files/parser/UnquotedObjectLookup.jq
diff --git a/src/main/resources/test_files/runtime-spark/BasicFlowr.jq b/src/test/resources/test_files/runtime-spark/BasicFlowr.jq
similarity index 58%
rename from src/main/resources/test_files/runtime-spark/BasicFlowr.jq
rename to src/test/resources/test_files/runtime-spark/BasicFlowr.jq
index 84507f3df1..abbc1f2324 100644
--- a/src/main/resources/test_files/runtime-spark/BasicFlowr.jq
+++ b/src/test/resources/test_files/runtime-spark/BasicFlowr.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldRun; Output="(Russian, Russian, Czech, Serbian, Serbian)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 return $i."target"
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/BasicFor.jq b/src/test/resources/test_files/runtime-spark/BasicFor.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/BasicFor.jq
rename to src/test/resources/test_files/runtime-spark/BasicFor.jq
diff --git a/src/main/resources/test_files/runtime-spark/BasicGroupBy2.jq b/src/test/resources/test_files/runtime-spark/BasicGroupBy2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/BasicGroupBy2.jq
rename to src/test/resources/test_files/runtime-spark/BasicGroupBy2.jq
diff --git a/src/main/resources/test_files/runtime-spark/BasicLetFor.jq b/src/test/resources/test_files/runtime-spark/BasicLetFor.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/BasicLetFor.jq
rename to src/test/resources/test_files/runtime-spark/BasicLetFor.jq
diff --git a/src/main/resources/test_files/runtime-spark/BasicOrderByClause.jq b/src/test/resources/test_files/runtime-spark/BasicOrderByClause.jq
similarity index 84%
rename from src/main/resources/test_files/runtime-spark/BasicOrderByClause.jq
rename to src/test/resources/test_files/runtime-spark/BasicOrderByClause.jq
index f05b898f75..a95877d1eb 100644
--- a/src/main/resources/test_files/runtime-spark/BasicOrderByClause.jq
+++ b/src/test/resources/test_files/runtime-spark/BasicOrderByClause.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="({ "target" : "Czech", "guess" : "Czech" }, { "target" : "Russian", "guess" : "Russian" }, { "target" : "Russian", "guess" : "Latvian" }, { "target" : "Serbian", "guess" : "Serbian" }, { "target" : "Serbian", "guess" : "Greek" })" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 order by $i."target", $i."guess" descending
 return {"target" : $i."target", "guess" : $i."guess"}
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/ControlIterators/RDDIfExpr.jq b/src/test/resources/test_files/runtime-spark/ControlIterators/RDDIfExpr.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ControlIterators/RDDIfExpr.jq
rename to src/test/resources/test_files/runtime-spark/ControlIterators/RDDIfExpr.jq
diff --git a/src/main/resources/test_files/runtime-spark/ControlIterators/RDDSwitchExpression.jq b/src/test/resources/test_files/runtime-spark/ControlIterators/RDDSwitchExpression.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ControlIterators/RDDSwitchExpression.jq
rename to src/test/resources/test_files/runtime-spark/ControlIterators/RDDSwitchExpression.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/CountClause1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/CountClause1.jq
similarity index 80%
rename from src/main/resources/test_files/runtime-spark/DataFrames/CountClause1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/CountClause1.jq
index c34c38b83b..2f8eb546fa 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/CountClause1.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/CountClause1.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="({ "target" : "Russian", "count" : 1 }, { "target" : "Russian", "count" : 2 }, { "target" : "Czech", "count" : 3 }, { "target" : "Serbian", "count" : 4 }, { "target" : "Serbian", "count" : 5 })" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 count $c
 return { "target" : $i."target", "count" : $c }
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/CountClause2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/CountClause2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/CountClause2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/CountClause2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/CountClause3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/CountClause3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/CountClause3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/CountClause3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/CountClause4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/CountClause4.jq
similarity index 79%
rename from src/main/resources/test_files/runtime-spark/DataFrames/CountClause4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/CountClause4.jq
index f7965171ed..8fdebfd4f8 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/CountClause4.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/CountClause4.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="({ "target" : "Russian", "count" : 1 }, { "target" : "Russian", "count" : 2 }, { "target" : "Czech", "count" : 3 }, { "target" : "Serbian", "count" : 4 }, { "target" : "Serbian", "count" : 5 })" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
+for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
 count $c
 return { "target" : $i."target", "count" : $c }
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause5.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause5.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause5.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause6.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause6.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause6.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause7.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause7.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause7.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause8.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause8.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause8.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClause9.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClause9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClause9.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClause9.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClauseType2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClauseType2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClauseType2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClauseType2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClauseType3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClauseType3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClauseType3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClauseType3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClauseType4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClauseType4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClauseType4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClauseType4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClauseTypeCheckError.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClauseTypeCheckError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClauseTypeCheckError.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClauseTypeCheckError.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/ForClauseTypeError2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroubyClauseTypeCheckError.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroubyClauseTypeCheckError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroubyClauseTypeCheckError.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroubyClauseTypeCheckError.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause1.jq
index 998f928c42..13419d0902 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause1.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="([ 1, { "guess" : "Czech", "target" : "Czech", "country" : "SE", "choices" : [ "Maori", "Czech", "Korean", "Turkish" ], "sample" : "1787b5c79a00b3513ce76847bc1f5b75", "date" : "2013-08-20" } ], [ 2, { "guess" : "Greek", "target" : "Serbian", "country" : "SE", "choices" : [ "German", "Greek", "Kannada", "Serbian" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" }, { "guess" : "Serbian", "target" : "Serbian", "country" : "AU", "choices" : [ "Dari", "Serbian", "Sinhalese", "Vietnamese" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" } ], [ 3, { "guess" : "Latvian", "target" : "Russian", "country" : "AU", "choices" : [ "Lao", "Latvian", "Russian", "Swahili" ], "sample" : "b7df3f9d67cef259fbcaa5abcad9d774", "date" : "2013-08-20" }, { "guess" : "Russian", "target" : "Russian", "country" : "AU", "choices" : [ "Croatian", "Nepali", "Russian", "Slovenian" ], "sample" : "8a59d48e99e8a1df7e366c4648095e27", "date" : "2013-08-20" } ])" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
+for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
 let $j := $i.target
 group by $j
 count $k
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause10.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause10.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause10.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause11.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause11.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause11.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause12.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause12.jq
similarity index 67%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause12.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause12.jq
index a06b020c2c..b641be33f4 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause12.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause12.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(2, 1, 1, 1)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 group by $y := $i.country, $t := $i.target
 let $c := count($i)
 order by $c descending
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause13.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause13.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause13.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause14.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause14.jq
similarity index 66%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause14.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause14.jq
index 0546675a20..92eef0add3 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause14.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause14.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(2, 1, 1, 1)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 group by $y := $i.country, $t := $i.target
 order by count($i) descending
 return count($i)
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause15.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause15.jq
similarity index 62%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause15.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause15.jq
index c305a2bb18..a7d9c43eef 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause15.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause15.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="2" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 group by $y := $i.country, $t := $i.target
 where count($i) eq 2
 return count($i)
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause16.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause16.jq
similarity index 68%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause16.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause16.jq
index e6cb4f9f5f..d6eae3fb55 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause16.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause16.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(1, 1, 1, 1, 2)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 group by $y := $i.country, $t := $i.target
 order by count($i)
 for $n in 1 to count($i)
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause17.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause17.jq
similarity index 65%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause17.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause17.jq
index 91c5bf0725..2cf7f9f54a 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause17.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause17.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(1, 2)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 group by $y := $i.country, $t := $i.target
 group by $j := count($i)
 order by $j
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause18.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause18.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause18.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause18.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause2.jq
similarity index 96%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause2.jq
index b155e10ff1..7cc2920319 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause2.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause2.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "Author" : "pregnanthollywood", "TotalScore" : -1 }, { "Author" : "uncannylizard", "TotalScore" : 0 }, { "Author" : "Mace55555", "TotalScore" : 1 }, { "Author" : "PeglegGecko", "TotalScore" : 1 }, { "Author" : "vhisic", "TotalScore" : 1 }, { "Author" : "asdjfweaiv", "TotalScore" : 1 }, { "Author" : "TimDisaster", "TotalScore" : 1 }, { "Author" : "kylionsfan", "TotalScore" : 1 }, { "Author" : "deephaven", "TotalScore" : 1 }, { "Author" : "politevelociraptor", "TotalScore" : 1 }, { "Author" : "billj457", "TotalScore" : 1 }, { "Author" : "MadagascarDifficulty", "TotalScore" : 1 }, { "Author" : "slicked9778", "TotalScore" : 1 }, { "Author" : "Crodface", "TotalScore" : 1 }, { "Author" : "MrRangerLP", "TotalScore" : 1 }, { "Author" : "Clomez", "TotalScore" : 1 }, { "Author" : "CarpeAeonem", "TotalScore" : 1 }, { "Author" : "Movepeck", "TotalScore" : 2 }, { "Author" : "Vamking12", "TotalScore" : 2 }, { "Author" : "gingerguitarx92x", "TotalScore" : 2 }, { "Author" : "Mastersimpson", "TotalScore" : 2 }, { "Author" : "marklar7", "TotalScore" : 2 }, { "Author" : "thebasedyeezus", "TotalScore" : 2 }, { "Author" : "highvoltorb", "TotalScore" : 2 }, { "Author" : "noitnemid", "TotalScore" : 2 }, { "Author" : "jaggazz", "TotalScore" : 2 }, { "Author" : "-purple-is-a-fruit-", "TotalScore" : 2 }, { "Author" : "FreeSoul789", "TotalScore" : 3 }, { "Author" : "RedCoatsForever", "TotalScore" : 3 }, { "Author" : "BigGupp1", "TotalScore" : 6 }, { "Author" : "[deleted]", "TotalScore" : 7 }, { "Author" : "submaRED", "TotalScore" : 7 }, { "Author" : "Meltingteeth", "TotalScore" : 10 }, { "Author" : "YoungModern", "TotalScore" : 14 }, { "Author" : "dewprisms", "TotalScore" : 17 })" :)
-for $i in json-file("./src/main/resources/queries/Reddit.json", 10)
+for $i in json-file("./src/test/resources/test_data/Reddit.json", 10)
 let $author := $i.author, $score := $i.score
 group by $author
 let $totalScore := sum($score)
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause3.jq
similarity index 97%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause3.jq
index 30c294775a..9fda21fd31 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause3.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause3.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "Language" : "Albanian", "Correct guesses" : 2 }, { "Language" : "Amharic", "Correct guesses" : 4 }, { "Language" : "Arabic", "Correct guesses" : 5 }, { "Language" : "Armenian", "Correct guesses" : 4 }, { "Language" : "Assyrian", "Correct guesses" : 8 }, { "Language" : "Bangla", "Correct guesses" : 3 }, { "Language" : "Bosnian", "Correct guesses" : 2 }, { "Language" : "Bulgarian", "Correct guesses" : 3 }, { "Language" : "Burmese", "Correct guesses" : 4 }, { "Language" : "Cantonese", "Correct guesses" : 2 }, { "Language" : "Czech", "Correct guesses" : 4 }, { "Language" : "Danish", "Correct guesses" : 3 }, { "Language" : "Dari", "Correct guesses" : 2 }, { "Language" : "Dinka", "Correct guesses" : 2 }, { "Language" : "Dutch", "Correct guesses" : 3 }, { "Language" : "Estonian", "Correct guesses" : 3 }, { "Language" : "Farsi", "Correct guesses" : 4 }, { "Language" : "Fijian", "Correct guesses" : 1 }, { "Language" : "Finnish", "Correct guesses" : 3 }, { "Language" : "French", "Correct guesses" : 7 }, { "Language" : "German", "Correct guesses" : 7 }, { "Language" : "Greek", "Correct guesses" : 1 }, { "Language" : "Gujarati", "Correct guesses" : 8 }, { "Language" : "Hebrew", "Correct guesses" : 10 }, { "Language" : "Hindi", "Correct guesses" : 5 }, { "Language" : "Hungarian", "Correct guesses" : 3 }, { "Language" : "Indonesian", "Correct guesses" : 5 }, { "Language" : "Italian", "Correct guesses" : 5 }, { "Language" : "Japanese", "Correct guesses" : 7 }, { "Language" : "Kannada", "Correct guesses" : 5 }, { "Language" : "Khmer", "Correct guesses" : 8 }, { "Language" : "Korean", "Correct guesses" : 3 }, { "Language" : "Kurdish", "Correct guesses" : 6 }, { "Language" : "Lao", "Correct guesses" : 7 }, { "Language" : "Latvian", "Correct guesses" : 5 }, { "Language" : "Macedonian", "Correct guesses" : 3 }, { "Language" : "Malay", "Correct guesses" : 3 }, { "Language" : "Malayalam", "Correct guesses" : 5 }, { "Language" : "Maltese", "Correct guesses" : 6 }, { "Language" : "Mandarin", "Correct guesses" : 8 }, { "Language" : "Nepali", "Correct guesses" : 7 }, { "Language" : "Norwegian", "Correct guesses" : 3 }, { "Language" : "Polish", "Correct guesses" : 4 }, { "Language" : "Portuguese", "Correct guesses" : 10 }, { "Language" : "Punjabi", "Correct guesses" : 7 }, { "Language" : "Romanian", "Correct guesses" : 7 }, { "Language" : "Russian", "Correct guesses" : 10 }, { "Language" : "Samoan", "Correct guesses" : 2 }, { "Language" : "Serbian", "Correct guesses" : 6 }, { "Language" : "Sinhalese", "Correct guesses" : 4 }, { "Language" : "Slovak", "Correct guesses" : 3 }, { "Language" : "Slovenian", "Correct guesses" : 3 }, { "Language" : "Somali", "Correct guesses" : 3 }, { "Language" : "Spanish", "Correct guesses" : 11 }, { "Language" : "Swahili", "Correct guesses" : 1 }, { "Language" : "Swedish", "Correct guesses" : 6 }, { "Language" : "Tagalog", "Correct guesses" : 4 }, { "Language" : "Tamil", "Correct guesses" : 5 }, { "Language" : "Thai", "Correct guesses" : 1 }, { "Language" : "Tigrinya", "Correct guesses" : 2 }, { "Language" : "Tongan", "Correct guesses" : 5 }, { "Language" : "Turkish", "Correct guesses" : 4 }, { "Language" : "Ukrainian", "Correct guesses" : 3 }, { "Language" : "Urdu", "Correct guesses" : 4 }, { "Language" : "Vietnamese", "Correct guesses" : 5 })" :)
-for $i in json-file("./src/main/resources/queries/confusion_sample.json")
+for $i in json-file("./src/test/resources/test_data/confusion_sample.json")
 let $guess := $i."guess", $target := $i."target"
 where $guess eq $target
 group by $target
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause5.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause5.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause5.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause6.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause6.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause6.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause7.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause7.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause7.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause8.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause8.jq
similarity index 73%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause8.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause8.jq
index 3a6dccba8a..e3f81be0d1 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause8.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause8.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(Czech, Serbian, Russian)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
+for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
 group by $target := $i.target
 return $target
 
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause9.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClause9.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClause9.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseBase64Binary.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseBase64Binary.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDate.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDate.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDate.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDateTime.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDateTime.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDateTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDurations.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDurations.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseDurations.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseError4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseHexBinary.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseHexBinary.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseHexBinary.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTime.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTime.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseType1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseType1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseType1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseType1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTypeError1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTypeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTypeError1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/GroupbyClauseTypeError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/LetClause1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/LetClause1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/LetClause1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/LetClause1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/LetClause2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/LetClause2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/LetClause2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/LetClause2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/LetClause3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/LetClause3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/LetClause3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/LetClause3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/LetClauseType1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/LetClauseType1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/LetClauseType1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/LetClauseType1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/LetClauseTypeCheckError.jq b/src/test/resources/test_files/runtime-spark/DataFrames/LetClauseTypeCheckError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/LetClauseTypeCheckError.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/LetClauseTypeCheckError.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/LetClauseTypeError1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/LetClauseTypeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/LetClauseTypeError1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/LetClauseTypeError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause5.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause5.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause5.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause6.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClause6.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClause6.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseBase64Binary.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseBase64Binary.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDate.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDate.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDate.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDateTime.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDateTime.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDateTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDurations.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDurations.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseDurations.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseError4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseHexBinary.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseHexBinary.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseHexBinary.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseTime.jq b/src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/OrderbyClauseTime.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/OrderbyClauseTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/Subsequence1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/Subsequence1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/Subsequence1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/Subsequence1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/Subsequence2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/Subsequence2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/Subsequence2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/Subsequence2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/Subsequence3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/Subsequence3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/Subsequence3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/Subsequence3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/Subsequence4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/Subsequence4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/Subsequence4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/Subsequence4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause1.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause1.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause1.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause10.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause10.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause10.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause11.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause11.jq
similarity index 78%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause11.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause11.jq
index 07a7903124..46a2607286 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause11.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause11.jq
@@ -3,7 +3,7 @@ for $rank in 1 to 4
 return {
   "Rank" : $rank,
   "Count" : count(
-  for $i in json-file("./src/main/resources/queries/conf-ex.json", 100)
+  for $i in json-file("./src/test/resources/test_data/conf-ex.json", 100)
   where $i.target eq $i.choices[[$rank]]
   return 1)
 }
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause2.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause2.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause3.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause3.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause4.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause4.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause4.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause5.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause5.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause5.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause6.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause6.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause6.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause7.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause7.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause7.jq
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause8.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause8.jq
similarity index 87%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause8.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause8.jq
index 950bd1d342..9ecfc65a43 100644
--- a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause8.jq
+++ b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause8.jq
@@ -2,7 +2,7 @@
 let $guess := "Russian"
 let $pos := 1
 return
-  for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
+  for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
   where $i.target eq $guess
   return $i[$pos]
   
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/DataFrames/WhereClause9.jq b/src/test/resources/test_files/runtime-spark/DataFrames/WhereClause9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DataFrames/WhereClause9.jq
rename to src/test/resources/test_files/runtime-spark/DataFrames/WhereClause9.jq
diff --git a/src/main/resources/test_files/runtime-spark/DistinctValues.jq b/src/test/resources/test_files/runtime-spark/DistinctValues.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DistinctValues.jq
rename to src/test/resources/test_files/runtime-spark/DistinctValues.jq
diff --git a/src/main/resources/test_files/runtime-spark/DistinctValues2.jq b/src/test/resources/test_files/runtime-spark/DistinctValues2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DistinctValues2.jq
rename to src/test/resources/test_files/runtime-spark/DistinctValues2.jq
diff --git a/src/main/resources/test_files/runtime-spark/DistinctValues3.jq b/src/test/resources/test_files/runtime-spark/DistinctValues3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DistinctValues3.jq
rename to src/test/resources/test_files/runtime-spark/DistinctValues3.jq
diff --git a/src/main/resources/test_files/runtime-spark/DistinctValues4.jq b/src/test/resources/test_files/runtime-spark/DistinctValues4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/DistinctValues4.jq
rename to src/test/resources/test_files/runtime-spark/DistinctValues4.jq
diff --git a/src/main/resources/test_files/runtime-spark/EmptySequence.jq b/src/test/resources/test_files/runtime-spark/EmptySequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/EmptySequence.jq
rename to src/test/resources/test_files/runtime-spark/EmptySequence.jq
diff --git a/src/main/resources/test_files/runtime-spark/EmptySequence2.jq b/src/test/resources/test_files/runtime-spark/EmptySequence2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/EmptySequence2.jq
rename to src/test/resources/test_files/runtime-spark/EmptySequence2.jq
diff --git a/src/main/resources/test_files/runtime-spark/ErrorStackTrace.jq b/src/test/resources/test_files/runtime-spark/ErrorStackTrace.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ErrorStackTrace.jq
rename to src/test/resources/test_files/runtime-spark/ErrorStackTrace.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile1.jq
similarity index 75%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFile1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFile1.jq
index 80211a3717..dae54f7d68 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile1.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "registration_dttm" : "2016-02-03T07:55:29Z", "id" : 1, "first_name" : "Amanda", "last_name" : "Jordan", "email" : "ajordan0@com.com", "gender" : "Female", "ip_address" : "1.197.201.2", "cc" : 6759521864920116, "country" : "Indonesia", "birthdate" : "3\/8\/1971", "salary" : 49756.53, "title" : "Internal Auditor", "comments" : "1E+02" }, 100)" :)
-avro-file("src/main/resources/queries/userdata1-limit.avro")[1],
-count(avro-file("src/main/resources/queries/userdata1-limit.avro"))
+avro-file("src/test/resources/test_data/userdata1-limit.avro")[1],
+count(avro-file("src/test/resources/test_data/userdata1-limit.avro"))
 
 (: read in file without arguments :)
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile2.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile2.jq
new file mode 100644
index 0000000000..7817656e90
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile2.jq
@@ -0,0 +1,5 @@
+(:JIQS: ShouldRun; Output="(Amanda, Albert)" :)
+avro-file("src/test/resources/test_data/userdata1-limit.avro", {ignoreExtension: false}).first_name[1],
+avro-file("src/test/resources/test_data/userdata1-limit.avro", {ignoreExtension: true}).first_name[2]
+
+(: add ignoreExtension option :)
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile3.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile3.jq
new file mode 100644
index 0000000000..f400f3d4ec
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile3.jq
@@ -0,0 +1,5 @@
+(:JIQS: ShouldRun; Output="(Amanda, Albert)" :)
+avro-file("src/test/resources/test_data/userdata1-limit.avro", {}).first_name[1],
+avro-file("src/test/resources/test_data/userdata1-limit.avro", {irrelevant: "foo"}).first_name[2]
+
+(: empty object and invalid option (should be ignored) :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile4.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile4.jq
similarity index 88%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFile4.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFile4.jq
index f2b8824f8b..4cfa3e6000 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFile4.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFile4.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="{ "registration_dttm" : "2016-02-03T15:49:55Z", "id" : 100, "first_name" : "Willie", "last_name" : "Weaver", "email" : "wweaver2r@google.de", "gender" : "Male", "ip_address" : "13.54.121.138", "cc" : 3534023246040472, "country" : "Mexico", "birthdate" : "8\/21\/1970", "salary" : 175694.61, "title" : "Dental Hygienist", "comments" : "\u0321\u0353\u0345\u031EI\u035D\u0317\u0318\u0326n\u0347\u0347\u0359v\u032E\u032Bok\u0332\u032B\u0319\u0348i\u0316\u0359\u032D\u0339\u0320\u031En\u0321\u033B\u032E\u0323\u033Ag\u0332\u0348\u0359\u032D\u0359\u032C\u034E \u0330t\u0354\u0326h\u031E\u0332e\u0322\u0324 \u034D\u032C\u0332\u0356f\u0334\u0318\u0355\u0323e\u0340\u0356e\u0323\u0325\u0329l\u0356\u0354\u035Ai\u0360\u0353\u035A\u0326n\u0356\u034D\u0317\u0353\u0333\u032Eg\u034D \u0328o\u0361\u035A\u032Af\u0318\u0323\u032C \u0316\u0318\u0356\u031F\u0359\u032Ec\u0489\u0354\u032B\u0356\u0353\u0347\u0356\u0345h\u0335\u0324\u0323\u035A\u0354a\u0341\u0317\u033C\u0345\u0355o\u033C\u0323\u0325s\u0362\u0331\u0348\u033A\u0316\u0326\u033B.\u031B\u0316\u031E\u0320\u032B\u0330" }" :)
-avro-file("src/main/resources/queries/userdata1-limit.avro", {"ignoreExtension": true, "avroSchema": "src/main/resources/queries/userdata.avsc"})[100]
+avro-file("src/test/resources/test_data/userdata1-limit.avro", {"ignoreExtension": true, "avroSchema": "src/test/resources/test_data/userdata.avsc"})[100]
 
 (: 2 valid options provided, with valid schema file :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError2.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError2.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError2.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError3.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError3.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError3.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError4.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError4.jq
similarity index 60%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError4.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError4.jq
index 1ff0be720e..8a9e96272a 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError4.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError4.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldCrash; ErrorCode="FODC0002"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-avro-file("src/main/resources/queries/userdata1-wrong.avro")
+avro-file("src/test/resources/test_data/userdata1-wrong.avro")
 
 (: wrong path :)
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError5.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError5.jq
new file mode 100644
index 0000000000..91f6d21f7d
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError5.jq
@@ -0,0 +1,4 @@
+(:JIQS: ShouldCrash; ErrorCode="FODC0002"; ErrorMetadata="LINE:2:COLUMN:0:" :)
+avro-file("src/test/resources/test_data/userdata1.avro", {"avroSchema": "src/test/resources/test_data/userdata-wrong.avsc"})
+
+(: wrong path in schema file :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError6.jq b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError6.jq
similarity index 58%
rename from src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError6.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError6.jq
index 87bb95ff78..87b7df7c94 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/AvroFileError6.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/AvroFileError6.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldCrash; ErrorCode="XPTY0004"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-avro-file("src/main/resources/queries/userdata1.avro", {"ignoreExtension": 1})
+avro-file("src/test/resources/test_data/userdata1.avro", {"ignoreExtension": 1})
 
 (: wrong path in schema file :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile1.jq
similarity index 85%
rename from src/main/resources/test_files/runtime-spark/FileInputs/CsvFile1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/CsvFile1.jq
index 881feb3bcf..7638fa2222 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFile1.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "_c0" : "LatD", "_c1" : "LatM", "_c2" : "LatS", "_c3" : "NS", "_c4" : "LonD", "_c5" : "LonM", "_c6" : "LonS", "_c7" : "EW", "_c8" : "City", "_c9" : "State" }, { "_c0" : "41", "_c1" : "5", "_c2" : "59", "_c3" : "N", "_c4" : "80", "_c5" : "39", "_c6" : "0", "_c7" : "W", "_c8" : "Youngstown", "_c9" : "OH" })" :)
-for $i in csv-file("./src/main/resources/queries/cities.csv")
+for $i in csv-file("./src/test/resources/test_data/cities.csv")
 count $c
 where $c le 2
 return $i
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile2.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile2.jq
new file mode 100644
index 0000000000..e947d3da38
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile2.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="131" :)
+count(csv-file("./src/test/resources/test_data/cities*.csv"))
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile3.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile3.jq
new file mode 100644
index 0000000000..533f7c4ad7
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile3.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="41" :)
+head(csv-file("./src/test/resources/test_data/cities.csv", {header: true}).LatD)
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile4.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile4.jq
new file mode 100644
index 0000000000..37dcf72015
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFile4.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="true" :)
+head(csv-file("./src/test/resources/test_data/cities.csv", {header: true, "inferSchema": true}).LatD) instance of integer
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileEmpty.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileEmpty.jq
new file mode 100644
index 0000000000..19efc2512b
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileEmpty.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="" :)
+csv-file("./src/test/resources/test_data/confusion_sample_empty.json")
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/CsvFileError1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/CsvFileError1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/CsvFileError1.jq
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileError2.jq b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileError2.jq
new file mode 100644
index 0000000000..6eb4567d16
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/CsvFileError2.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldCrash; ErrorCode="XPTY0004":)
+csv-file("./src/test/resources/test_data/cities.csv", {"header": [true]})
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/JsonFile-ErrorNotFound1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/JsonFile-ErrorNotFound1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/JsonFile-ErrorNotFound1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/JsonFile-ErrorNotFound1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/JsonFile.jq b/src/test/resources/test_files/runtime-spark/FileInputs/JsonFile.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/FileInputs/JsonFile.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/JsonFile.jq
index 72daf37136..2005d9f5fd 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/JsonFile.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/JsonFile.jq
@@ -1,2 +1,2 @@
 (:JIQS: ShouldRun; Output="({ "guess" : "Latvian", "target" : "Russian", "country" : "AU", "choices" : [ "Lao", "Latvian", "Russian", "Swahili" ], "sample" : "b7df3f9d67cef259fbcaa5abcad9d774", "date" : "2013-08-20" }, { "guess" : "Russian", "target" : "Russian", "country" : "AU", "choices" : [ "Croatian", "Nepali", "Russian", "Slovenian" ], "sample" : "8a59d48e99e8a1df7e366c4648095e27", "date" : "2013-08-20" }, { "guess" : "Czech", "target" : "Czech", "country" : "SE", "choices" : [ "Maori", "Czech", "Korean", "Turkish" ], "sample" : "1787b5c79a00b3513ce76847bc1f5b75", "date" : "2013-08-20" }, { "guess" : "Greek", "target" : "Serbian", "country" : "SE", "choices" : [ "German", "Greek", "Kannada", "Serbian" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" }, { "guess" : "Serbian", "target" : "Serbian", "country" : "AU", "choices" : [ "Dari", "Serbian", "Sinhalese", "Vietnamese" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" })" :)
-json-file("./src/main/resources/queries/conf-ex.json", 10)
+json-file("./src/test/resources/test_data/conf-ex.json", 10)
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/JsonFileEmpty.jq b/src/test/resources/test_files/runtime-spark/FileInputs/JsonFileEmpty.jq
new file mode 100644
index 0000000000..1bc7f46ce5
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/JsonFileEmpty.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="" :)
+json-file("./src/test/resources/test_data/emptyFile.txt", 10)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/LibsvmFile-Error-NotFound1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/LibsvmFile-Error-NotFound1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/LibsvmFile-Error-NotFound1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/LibsvmFile-Error-NotFound1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/Parquet.jq b/src/test/resources/test_files/runtime-spark/FileInputs/Parquet.jq
similarity index 87%
rename from src/main/resources/test_files/runtime-spark/FileInputs/Parquet.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/Parquet.jq
index 20f240c3e4..2076b1b9ec 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/Parquet.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/Parquet.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldRun; Output="{ "bool" : true, "bool_array" : [ true ], "float" : 4.2, "float_array" : [ 4.2 ], "int64" : 42, "int64_array" : [ 42 ], "null" : null, "object" : { "bool" : true, "float" : 4.2, "int64" : 42, "null" : null, "object" : { "bool" : true, "null" : null }, "string" : "hello" }, "object_array" : [ { "bool" : true, "float" : 4.2, "int64" : 42, "null" : null, "object" : { "bool" : true, "null" : null }, "string" : "hello" } ], "string" : "hello", "string_array" : [ "hello" ] }" :)
-parquet-file("./src/main/resources/queries/sample-json.snappy.parquet")
+parquet-file("./src/test/resources/test_data/sample-json.snappy.parquet")
 
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/ParquetEmpty.jq.disabled b/src/test/resources/test_files/runtime-spark/FileInputs/ParquetEmpty.jq.disabled
similarity index 55%
rename from src/main/resources/test_files/runtime-spark/FileInputs/ParquetEmpty.jq.disabled
rename to src/test/resources/test_files/runtime-spark/FileInputs/ParquetEmpty.jq.disabled
index 87351b152b..8e26863304 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/ParquetEmpty.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/ParquetEmpty.jq.disabled
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="" :)
-parquet-file("./src/main/resources/queries/emptyFile.parquet")
+parquet-file("./src/test/resources/test_data/emptyFile.parquet")
 
 (: TODO: Empty Parquet file needs to be added :)
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/ParquetFile-Error-NotFound1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/ParquetFile-Error-NotFound1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/ParquetFile-Error-NotFound1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/ParquetFile-Error-NotFound1.jq
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-Malformed1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-Malformed1.jq
new file mode 100644
index 0000000000..bf5135717b
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-Malformed1.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldCrash; ErrorCode="XPDY0130"; ErrorMetadata="LINE:2;COLUMN:0;"  :)
+structured-json-file("./src/test/resources/test_data/SpreadOverMultipleLinesDocument.json")
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-NotFound1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-NotFound1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-NotFound1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile-Error-NotFound1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile.jq b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile.jq
index d970b1509e..c8f80f63f3 100644
--- a/src/main/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile.jq
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFile.jq
@@ -1,2 +1,2 @@
 (:JIQS: ShouldRun; Output="({ "choices" : [ "Lao", "Latvian", "Russian", "Swahili" ], "country" : "AU", "date" : "2013-08-20", "guess" : "Latvian", "sample" : "b7df3f9d67cef259fbcaa5abcad9d774", "target" : "Russian" }, { "choices" : [ "Croatian", "Nepali", "Russian", "Slovenian" ], "country" : "AU", "date" : "2013-08-20", "guess" : "Russian", "sample" : "8a59d48e99e8a1df7e366c4648095e27", "target" : "Russian" }, { "choices" : [ "Maori", "Czech", "Korean", "Turkish" ], "country" : "SE", "date" : "2013-08-20", "guess" : "Czech", "sample" : "1787b5c79a00b3513ce76847bc1f5b75", "target" : "Czech" }, { "choices" : [ "German", "Greek", "Kannada", "Serbian" ], "country" : "SE", "date" : "2013-08-20", "guess" : "Greek", "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "target" : "Serbian" }, { "choices" : [ "Dari", "Serbian", "Sinhalese", "Vietnamese" ], "country" : "AU", "date" : "2013-08-20", "guess" : "Serbian", "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "target" : "Serbian" })" :)
-structured-json-file("./src/main/resources/queries/conf-ex.json")
+structured-json-file("./src/test/resources/test_data/conf-ex.json")
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFileEmpty.jq b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFileEmpty.jq
new file mode 100644
index 0000000000..4d7109ecfc
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/StructuredJsonFileEmpty.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="" :)
+structured-json-file("./src/test/resources/test_data/emptyFile.txt")
diff --git a/src/main/resources/test_files/runtime-spark/FileInputs/TextFile-ErrorNotFound1.jq b/src/test/resources/test_files/runtime-spark/FileInputs/TextFile-ErrorNotFound1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FileInputs/TextFile-ErrorNotFound1.jq
rename to src/test/resources/test_files/runtime-spark/FileInputs/TextFile-ErrorNotFound1.jq
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/TextFile.jq b/src/test/resources/test_files/runtime-spark/FileInputs/TextFile.jq
new file mode 100644
index 0000000000..0e1b556213
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/TextFile.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="(foo, bar, foobar)" :)
+text-file("./src/test/resources/test_data/file.txt", 10)
\ No newline at end of file
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/TextFile2.jq b/src/test/resources/test_files/runtime-spark/FileInputs/TextFile2.jq
new file mode 100644
index 0000000000..2cf78b62df
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/TextFile2.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="(foo, bar, foobar)" :)
+text-file("./src/test/resources/test_data/file.txt")
\ No newline at end of file
diff --git a/src/test/resources/test_files/runtime-spark/FileInputs/TextFileEmpty.jq b/src/test/resources/test_files/runtime-spark/FileInputs/TextFileEmpty.jq
new file mode 100644
index 0000000000..339bdf36b9
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FileInputs/TextFileEmpty.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="" :)
+text-file("./src/test/resources/test_data/emptyFile.txt", 10)
diff --git a/src/main/resources/test_files/runtime-spark/ForMultipleVar.jq b/src/test/resources/test_files/runtime-spark/ForMultipleVar.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ForMultipleVar.jq
rename to src/test/resources/test_files/runtime-spark/ForMultipleVar.jq
diff --git a/src/main/resources/test_files/runtime-spark/ForNonRDD.jq b/src/test/resources/test_files/runtime-spark/ForNonRDD.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ForNonRDD.jq
rename to src/test/resources/test_files/runtime-spark/ForNonRDD.jq
diff --git a/src/main/resources/test_files/runtime-spark/ForSequence.jq b/src/test/resources/test_files/runtime-spark/ForSequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ForSequence.jq
rename to src/test/resources/test_files/runtime-spark/ForSequence.jq
diff --git a/src/main/resources/test_files/runtime-spark/ForVariableReuse.jq b/src/test/resources/test_files/runtime-spark/ForVariableReuse.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ForVariableReuse.jq
rename to src/test/resources/test_files/runtime-spark/ForVariableReuse.jq
diff --git a/src/main/resources/test_files/runtime-spark/ForWhereOrderBy.jq b/src/test/resources/test_files/runtime-spark/ForWhereOrderBy.jq
similarity index 91%
rename from src/main/resources/test_files/runtime-spark/ForWhereOrderBy.jq
rename to src/test/resources/test_files/runtime-spark/ForWhereOrderBy.jq
index 007150a07d..e2cf280a11 100644
--- a/src/main/resources/test_files/runtime-spark/ForWhereOrderBy.jq
+++ b/src/test/resources/test_files/runtime-spark/ForWhereOrderBy.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "guess" : "Czech", "target" : "Czech", "country" : "SE", "choices" : [ "Maori", "Czech", "Korean", "Turkish" ], "sample" : "1787b5c79a00b3513ce76847bc1f5b75", "date" : "2013-08-20" }, { "guess" : "Russian", "target" : "Russian", "country" : "AU", "choices" : [ "Croatian", "Nepali", "Russian", "Slovenian" ], "sample" : "8a59d48e99e8a1df7e366c4648095e27", "date" : "2013-08-20" }, { "guess" : "Serbian", "target" : "Serbian", "country" : "AU", "choices" : [ "Dari", "Serbian", "Sinhalese", "Vietnamese" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" })" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 let $guess := $i."guess", $target := $i."target"
 where $guess eq $target
 order by $target, $i.country descending, $i.date descending
diff --git a/src/main/resources/test_files/runtime-spark/Fors.jq b/src/test/resources/test_files/runtime-spark/Fors.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Fors.jq
rename to src/test/resources/test_files/runtime-spark/Fors.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error1.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error1.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error2.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error2.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error2.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error3.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error3.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplication-Error3.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD1.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD1.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD2.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD2.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD2.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD3.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD3.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD3.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD5.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD5.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD5.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD6.jq b/src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD6.jq
rename to src/test/resources/test_files/runtime-spark/FunctionPartialApplication/PartialFunctionApplicationRDD6.jq
diff --git a/src/test/resources/test_files/runtime-spark/FunctionSequence/FunctionCountDF.jq b/src/test/resources/test_files/runtime-spark/FunctionSequence/FunctionCountDF.jq
new file mode 100644
index 0000000000..86225cbeab
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FunctionSequence/FunctionCountDF.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="(500, 0)" :)
+count(json-file("./src/test/resources/test_data/confusion_sample.json")),
+count(json-file("./src/test/resources/test_data/confusion_sample_empty.json"))
diff --git a/src/test/resources/test_files/runtime-spark/FunctionSequence/FunctionCountRDD.jq b/src/test/resources/test_files/runtime-spark/FunctionSequence/FunctionCountRDD.jq
new file mode 100644
index 0000000000..67b194b851
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/FunctionSequence/FunctionCountRDD.jq
@@ -0,0 +1,5 @@
+(:JIQS: ShouldRun; Output="(500, 0, 1)" :)
+count(structured-json-file("./src/test/resources/test_data/confusion_sample.json")),
+count(structured-json-file("./src/test/resources/test_data/confusion_sample_empty.json")),
+count(parquet-file("./src/test/resources/test_data/sample-json.snappy.parquet"))
+
diff --git a/src/main/resources/test_files/runtime-spark/FunctionSequence/RDDInstanceOf.jq b/src/test/resources/test_files/runtime-spark/FunctionSequence/RDDInstanceOf.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionSequence/RDDInstanceOf.jq
rename to src/test/resources/test_files/runtime-spark/FunctionSequence/RDDInstanceOf.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAs.jq b/src/test/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAs.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAs.jq
rename to src/test/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAs.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAsError.jq b/src/test/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAsError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAsError.jq
rename to src/test/resources/test_files/runtime-spark/FunctionSequence/RDDTreatAsError.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error1.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error1.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error1.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error2.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error2.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error2.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error3.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error3.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error3.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error4.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error4.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD-Error4.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD1.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD1.jq
similarity index 92%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD1.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD1.jq
index f0c6e6edcc..5174c3afad 100644
--- a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD1.jq
+++ b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "guess" : "Finnish", "target" : "Finnish", "country" : "AU", "choices" : [ "Finnish", "Kurdish", "Turkish", "Yiddish" ], "sample" : "4a3dfa40ed621940a0a38408956b86e0", "date" : "2013-08-19" }, { "guess" : "Finnish", "target" : "Croatian", "country" : "AU", "choices" : [ "Croatian", "Estonian", "Finnish", "Samoan" ], "sample" : "a0d2070edd63b46a3e71b4fb7ffe5375", "date" : "2013-08-20" }, { "guess" : "Finnish", "target" : "Finnish", "country" : "AU", "choices" : [ "Bosnian", "Finnish", "Hungarian", "Slovak" ], "sample" : "d47ff7f3aa1abf002cad40ef24122c08", "date" : "2013-08-20" }, { "guess" : "Finnish", "target" : "Finnish", "country" : "AU", "choices" : [ "Amharic", "Finnish", "Russian", "Samoan" ], "sample" : "65b5bf9df0f8ec61111d20c6b48db671", "date" : "2013-08-20" })":)
 let $f := function($x) { $x.guess eq "Finnish" }
-for $o in json-file("./src/main/resources/queries/confusion_sample.json")
+for $o in json-file("./src/test/resources/test_data/confusion_sample.json")
 where $f($o)
 return $o
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD2.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD2.jq
similarity index 92%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD2.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD2.jq
index d4d6b0d7ae..b8c4211588 100644
--- a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD2.jq
+++ b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD2.jq
@@ -2,6 +2,6 @@
 declare function f($x) {
 $x.guess eq "Finnish"
 };
-for $o in json-file("./src/main/resources/queries/confusion_sample.json")
+for $o in json-file("./src/test/resources/test_data/confusion_sample.json")
 where f($o)
 return $o
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD3.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD3.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD3.jq
diff --git a/src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD4.jq b/src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD4.jq
rename to src/test/resources/test_files/runtime-spark/FunctionUserDefinedDynamic/NamedFunctionRefRDD4.jq
diff --git a/src/main/resources/test_files/runtime-spark/InitialLet.jq b/src/test/resources/test_files/runtime-spark/InitialLet.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/InitialLet.jq
rename to src/test/resources/test_files/runtime-spark/InitialLet.jq
diff --git a/src/main/resources/test_files/runtime-spark/Issue15_Bug_with_if-then-else.jq b/src/test/resources/test_files/runtime-spark/Issue15_Bug_with_if-then-else.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Issue15_Bug_with_if-then-else.jq
rename to src/test/resources/test_files/runtime-spark/Issue15_Bug_with_if-then-else.jq
diff --git a/src/main/resources/test_files/runtime-spark/LetFlowr.jq b/src/test/resources/test_files/runtime-spark/LetFlowr.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LetFlowr.jq
rename to src/test/resources/test_files/runtime-spark/LetFlowr.jq
diff --git a/src/main/resources/test_files/runtime-spark/LetFlowrJson.jq b/src/test/resources/test_files/runtime-spark/LetFlowrJson.jq
similarity index 84%
rename from src/main/resources/test_files/runtime-spark/LetFlowrJson.jq
rename to src/test/resources/test_files/runtime-spark/LetFlowrJson.jq
index 4a3970d1a4..1b41aa254d 100644
--- a/src/main/resources/test_files/runtime-spark/LetFlowrJson.jq
+++ b/src/test/resources/test_files/runtime-spark/LetFlowrJson.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "target" : "Russian", "guess" : "Latvian" }, { "target" : "Russian", "guess" : "Russian" }, { "target" : "Czech", "guess" : "Czech" }, { "target" : "Serbian", "guess" : "Greek" }, { "target" : "Serbian", "guess" : "Serbian" })" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 let $target := $i."target"
 let $guess := $i."guess"
 return {"target" : $target, "guess": $guess}
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime-spark/LetFlowrReuse.jq b/src/test/resources/test_files/runtime-spark/LetFlowrReuse.jq
similarity index 87%
rename from src/main/resources/test_files/runtime-spark/LetFlowrReuse.jq
rename to src/test/resources/test_files/runtime-spark/LetFlowrReuse.jq
index c08bcafc9f..2f108d4111 100644
--- a/src/main/resources/test_files/runtime-spark/LetFlowrReuse.jq
+++ b/src/test/resources/test_files/runtime-spark/LetFlowrReuse.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(Latvian, Russian, Czech, Greek, Serbian)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 let $target := $i."target"
 let $target := $i."guess"
 let $target := $i."target"
diff --git a/src/main/resources/test_files/runtime-spark/LetObjectAccess.jq b/src/test/resources/test_files/runtime-spark/LetObjectAccess.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LetObjectAccess.jq
rename to src/test/resources/test_files/runtime-spark/LetObjectAccess.jq
diff --git a/src/main/resources/test_files/runtime-spark/LetSequence.jq b/src/test/resources/test_files/runtime-spark/LetSequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LetSequence.jq
rename to src/test/resources/test_files/runtime-spark/LetSequence.jq
diff --git a/src/main/resources/test_files/runtime-spark/LetVariableReuse.jq b/src/test/resources/test_files/runtime-spark/LetVariableReuse.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LetVariableReuse.jq
rename to src/test/resources/test_files/runtime-spark/LetVariableReuse.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/CombinationLocalLetForWhere1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/CombinationLocalLetForWhere1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/CombinationLocalLetForWhere1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/CombinationLocalLetForWhere1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal3.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal3.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/CountClauseLocal3.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal3.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal3.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToLocal3.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD2.jq
similarity index 74%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD2.jq
index 504f662008..99392f97d1 100644
--- a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD2.jq
+++ b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseLocalToRDD2.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(Latvian, Russian, Czech, Greek, Serbian)" :)
-let $name := "./src/main/resources/queries/conf-ex.json"
+let $name := "./src/test/resources/test_data/conf-ex.json"
 for $line in json-file($name)
 return $line.guess
 
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD1 b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD1
similarity index 78%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD1
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD1
index 88b01c3c40..4370836977 100644
--- a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD1
+++ b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD1
@@ -1,9 +1,9 @@
 (:JIQS: ShouldRun; Output="(25, Latvian, Russian, Czech, Greek, Serbian, Latvian, Russian, Czech, Greek, Serbian, Latvian, Russian, Czech, Greek, Serbian, Latvian, Russian, Czech, Greek, Serbian, Latvian, Russian, Czech, Greek, Serbian)" :)
-count( let $name := "./src/main/resources/queries/conf-ex.json"
+count( let $name := "./src/test/resources/test_data/conf-ex.json"
 for $line1 in json-file($name)
 for $line2 in json-file($name)
 return $line2.guess),
-let $name := "./src/main/resources/queries/conf-ex.json"
+let $name := "./src/test/resources/test_data/conf-ex.json"
 for $line1 in json-file($name)
 for $line2 in json-file($name)
 return $line2.guess
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD2 b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD2
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD2
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseRDDToRDD2
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseTypeCheckError.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseTypeCheckError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForClauseTypeCheckError.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForClauseTypeCheckError.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForLetClauses1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForLetClauses1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForLetClauses1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForLetClauses1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForLetClauses2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForLetClauses2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForLetClauses2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForLetClauses2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/ForLetClauses3.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/ForLetClauses3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/ForLetClauses3.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/ForLetClauses3.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseBase64Binary.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseBase64Binary.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDate.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDate.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDate.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDateTime.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDateTime.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDateTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDurations.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDurations.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseDurations.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseHexBinary.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseHexBinary.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseHexBinary.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTime.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTime.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTypeCheckError.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTypeCheckError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTypeCheckError.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/GroupbyClauseTypeCheckError.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal3.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal3.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal3.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal4.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal4.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal4.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal5.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal5.jq
similarity index 51%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal5.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal5.jq
index 28dfc80006..181ed60466 100644
--- a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal5.jq
+++ b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseLocal5.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="5" :)
-let $i := json-file("./src/main/resources/queries/conf-ex.json") return count($i)
+let $i := json-file("./src/test/resources/test_data/conf-ex.json") return count($i)
 
 (: first let clause with an RDD(gets materialized) :)
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseTypeCheckError.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseTypeCheckError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/LetClauseTypeCheckError.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/LetClauseTypeCheckError.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal10.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal10.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal10.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal11.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal11.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal11.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal12.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal12.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal12.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal13.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal13.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal13.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal14.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal14.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal14.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal15.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal15.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal15.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal16.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal16.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal16.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal16.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal3.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal3.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal3.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal4.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal4.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal4.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal5.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal5.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal5.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal6.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal6.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal6.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal7.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal7.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal7.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal8.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal8.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal8.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal9.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal9.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocal9.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocalError1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocalError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocalError1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderClauseLocalError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseBase64Binary.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseBase64Binary.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDate.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDate.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDate.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDateTime.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDateTime.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDateTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDurations.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDurations.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseDurations.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseHexBinary.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseHexBinary.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseHexBinary.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseTime.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseTime.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/OrderbyClauseTime.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal1.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal1.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal10.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal10.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal10.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal11.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal11.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal11.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal12.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal12.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal12.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal13.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal13.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal13.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal14.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal14.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal14.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal15.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal15.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal15.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal2.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal2.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal3.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal3.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal3.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal4.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal4.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal4.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal5.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal5.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal5.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal6.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal6.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal6.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal7.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal7.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal7.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal8.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal8.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal8.jq
diff --git a/src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal9.jq b/src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal9.jq
rename to src/test/resources/test_files/runtime-spark/LocalClauses/WhereClauseLocal9.jq
diff --git a/src/main/resources/test_files/runtime-spark/MaterializationError.jq b/src/test/resources/test_files/runtime-spark/MaterializationError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/MaterializationError.jq
rename to src/test/resources/test_files/runtime-spark/MaterializationError.jq
diff --git a/src/main/resources/test_files/runtime-spark/MidForBasic.jq b/src/test/resources/test_files/runtime-spark/MidForBasic.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/MidForBasic.jq
rename to src/test/resources/test_files/runtime-spark/MidForBasic.jq
diff --git a/src/main/resources/test_files/runtime-spark/MidForVariable.jq b/src/test/resources/test_files/runtime-spark/MidForVariable.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/MidForVariable.jq
rename to src/test/resources/test_files/runtime-spark/MidForVariable.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSpark1.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSpark1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSpark1.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSpark1.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSpark2.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSpark2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSpark2.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSpark2.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSpark3.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSpark3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSpark3.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSpark3.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError1.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError1.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError2.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError2.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError2.jq
diff --git a/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError3.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError3.jq
new file mode 100644
index 0000000000..8df611ade2
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError3.jq
@@ -0,0 +1,7 @@
+(:JIQS: ShouldCrash; ErrorCode="RBST0003"; ErrorMetadata="LINE:3:COLUMN:4:" :)
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
+let $j := for $k in json-file("./src/test/resources/test_data/conf-ex.json")
+          return $k.target
+return $j
+
+(: Job within job :)
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError4.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError4.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError4.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError5.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError5.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError5.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError6.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError6.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError6.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError7.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError7.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError7.jq
diff --git a/src/main/resources/test_files/runtime-spark/NestedFLWORSparkError8.jq b/src/test/resources/test_files/runtime-spark/NestedFLWORSparkError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/NestedFLWORSparkError8.jq
rename to src/test/resources/test_files/runtime-spark/NestedFLWORSparkError8.jq
diff --git a/src/main/resources/test_files/runtime-spark/Parallelize1.jq b/src/test/resources/test_files/runtime-spark/Parallelize1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Parallelize1.jq
rename to src/test/resources/test_files/runtime-spark/Parallelize1.jq
diff --git a/src/main/resources/test_files/runtime-spark/Parallelize2.jq b/src/test/resources/test_files/runtime-spark/Parallelize2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Parallelize2.jq
rename to src/test/resources/test_files/runtime-spark/Parallelize2.jq
diff --git a/src/main/resources/test_files/runtime-spark/Parallelize3.disabled b/src/test/resources/test_files/runtime-spark/Parallelize3.disabled
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Parallelize3.disabled
rename to src/test/resources/test_files/runtime-spark/Parallelize3.disabled
diff --git a/src/main/resources/test_files/runtime-spark/Parallelize4.disabled b/src/test/resources/test_files/runtime-spark/Parallelize4.disabled
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Parallelize4.disabled
rename to src/test/resources/test_files/runtime-spark/Parallelize4.disabled
diff --git a/src/main/resources/test_files/runtime-spark/ParallelizePartitions-Error1.jq b/src/test/resources/test_files/runtime-spark/ParallelizePartitions-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ParallelizePartitions-Error1.jq
rename to src/test/resources/test_files/runtime-spark/ParallelizePartitions-Error1.jq
diff --git a/src/main/resources/test_files/runtime-spark/ParallelizePartitions-Error2.jq b/src/test/resources/test_files/runtime-spark/ParallelizePartitions-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ParallelizePartitions-Error2.jq
rename to src/test/resources/test_files/runtime-spark/ParallelizePartitions-Error2.jq
diff --git a/src/main/resources/test_files/runtime-spark/ParallelizePartitions1.jq b/src/test/resources/test_files/runtime-spark/ParallelizePartitions1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ParallelizePartitions1.jq
rename to src/test/resources/test_files/runtime-spark/ParallelizePartitions1.jq
diff --git a/src/main/resources/test_files/runtime-spark/ParallelizePartitions2.jq b/src/test/resources/test_files/runtime-spark/ParallelizePartitions2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ParallelizePartitions2.jq
rename to src/test/resources/test_files/runtime-spark/ParallelizePartitions2.jq
diff --git a/src/main/resources/test_files/runtime-spark/ParallelizePartitions3.jq b/src/test/resources/test_files/runtime-spark/ParallelizePartitions3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ParallelizePartitions3.jq
rename to src/test/resources/test_files/runtime-spark/ParallelizePartitions3.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate1.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate1.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate1.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate2.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate2.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate2.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate3.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate3.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate3.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate4.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate4.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate4.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate5.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate5.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate5.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate6.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate6.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate6.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate7.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate7.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate7.jq
diff --git a/src/main/resources/test_files/runtime-spark/PositionPredicate8.jq b/src/test/resources/test_files/runtime-spark/PositionPredicate8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/PositionPredicate8.jq
rename to src/test/resources/test_files/runtime-spark/PositionPredicate8.jq
diff --git a/src/main/resources/test_files/runtime-spark/Primes.jq b/src/test/resources/test_files/runtime-spark/Primes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Primes.jq
rename to src/test/resources/test_files/runtime-spark/Primes.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayDescendant.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayDescendant.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayDescendant.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayDescendant.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayFlatten.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayFlatten.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayFlatten.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayFlatten.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup2.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup2.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup2.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup3.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup3.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup3.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup4.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup4.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup4.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup5.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup5.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup5.jq
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup6.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup6.jq
new file mode 100644
index 0000000000..22f6b755fc
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup6.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="(test2, test5)" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foobar.foo[[2]]
+
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup7.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayLookup7.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup7.jq
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup8.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup8.jq
new file mode 100644
index 0000000000..6ae7ec3d0b
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayLookup8.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foobar[[2]]
+
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing2.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing2.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing2.jq
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing3.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing3.jq
new file mode 100644
index 0000000000..779426560a
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing3.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="(test1, test2, test4, test5)" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foobar.foo[]
+
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing4.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing4.jq
new file mode 100644
index 0000000000..1dbf314210
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing4.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foobar[]
+
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing5.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing5.jq
new file mode 100644
index 0000000000..52d586002d
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ArrayUnboxing5.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foo[]
+
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Empty.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Empty.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Empty.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Empty.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Exists.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Exists.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Exists.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Exists.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Head.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Head.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Head.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Head.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Intersect.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Intersect.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Intersect.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Intersect.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF1.jq b/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF1.jq
similarity index 51%
rename from src/main/resources/test_files/runtime-spark/Pushdown/KeysDF1.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/KeysDF1.jq
index 4690789962..0e1139b97f 100644
--- a/src/main/resources/test_files/runtime-spark/Pushdown/KeysDF1.jq
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF1.jq
@@ -1,2 +1,2 @@
 (:JIQS: ShouldRun; Output="(choices, country, date, guess, sample, target)" :)
-keys(structured-json-file("./src/main/resources/queries/conf-ex.json"))
+keys(structured-json-file("./src/test/resources/test_data/conf-ex.json"))
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF2.jq b/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF2.jq
new file mode 100644
index 0000000000..d4a5b4f9d7
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF2.jq
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="" :)
+keys(keys(structured-json-file("./src/test/resources/test_data/conf-ex.json")))
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF3.jq b/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF3.jq
new file mode 100644
index 0000000000..09850529bd
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/KeysDF3.jq
@@ -0,0 +1,4 @@
+(:JIQS: ShouldRun; Output="" :)
+for $k in keys(keys(structured-json-file("./src/test/resources/test_data/conf-ex.json")))
+group by $k
+return $k
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/KeysRDD.jq b/src/test/resources/test_files/runtime-spark/Pushdown/KeysRDD.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/KeysRDD.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/KeysRDD.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/KeysRDD2.jq b/src/test/resources/test_files/runtime-spark/Pushdown/KeysRDD2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/KeysRDD2.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/KeysRDD2.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/KeysRDD3.jq b/src/test/resources/test_files/runtime-spark/Pushdown/KeysRDD3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/KeysRDD3.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/KeysRDD3.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectDescendant.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectDescendant.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ObjectDescendant.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ObjectDescendant.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup2.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup2.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup2.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup3.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup3.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup3.jq
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup4.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup4.jq
new file mode 100644
index 0000000000..c33e31ccd1
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup4.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="(1, 2)" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foo
+
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup5.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup5.jq
similarity index 70%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup5.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup5.jq
index 07fb21b4f3..66b18d8719 100644
--- a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookup5.jq
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup5.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldRun; Output="({ "bar" : 2, "foo" : [ "test1", "test2" ], "foobar" : { "foo" : 1 } }, { "bar" : 2, "foo" : [ "test4", "test5" ], "foobar" : { "foo" : 2 } })" :)
-structured-json-file("./src/main/resources/queries/nested.json").foobar
+structured-json-file("./src/test/resources/test_data/nested.json").foobar
 
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup6.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup6.jq
new file mode 100644
index 0000000000..d79a0fe775
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup6.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="([ "test1", "test2" ], [ "test4", "test5" ])" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foobar.foo
+
diff --git a/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup7.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup7.jq
new file mode 100644
index 0000000000..e5d86851f9
--- /dev/null
+++ b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookup7.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="" :)
+structured-json-file("./src/test/resources/test_data/nested.json").foob
+
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookupNested.jq b/src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookupNested.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/ObjectLookupNested.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/ObjectLookupNested.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Predicate.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Predicate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Predicate.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Predicate.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Predicate2.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Predicate2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Predicate2.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Predicate2.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Predicate3.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Predicate3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Predicate3.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Predicate3.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Predicate4.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Predicate4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Predicate4.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Predicate4.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Predicate5.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Predicate5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Predicate5.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Predicate5.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Project.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Project.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Project.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Project.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/RemoveKeys.jq b/src/test/resources/test_files/runtime-spark/Pushdown/RemoveKeys.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/RemoveKeys.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/RemoveKeys.jq
diff --git a/src/main/resources/test_files/runtime-spark/Pushdown/Values.jq b/src/test/resources/test_files/runtime-spark/Pushdown/Values.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Pushdown/Values.jq
rename to src/test/resources/test_files/runtime-spark/Pushdown/Values.jq
diff --git a/src/main/resources/test_files/runtime-spark/RDDComma.jq b/src/test/resources/test_files/runtime-spark/RDDComma.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RDDComma.jq
rename to src/test/resources/test_files/runtime-spark/RDDComma.jq
diff --git a/src/main/resources/test_files/runtime-spark/RDDOutputFormat.jq b/src/test/resources/test_files/runtime-spark/RDDOutputFormat.jq
similarity index 64%
rename from src/main/resources/test_files/runtime-spark/RDDOutputFormat.jq
rename to src/test/resources/test_files/runtime-spark/RDDOutputFormat.jq
index f5f627a596..9c1aa5d581 100644
--- a/src/main/resources/test_files/runtime-spark/RDDOutputFormat.jq
+++ b/src/test/resources/test_files/runtime-spark/RDDOutputFormat.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="(Latvian, Russian, Czech, Greek, Serbian)" :)
 
-for $o in json-file("./src/main/resources/queries/conf-ex.json") return $o.guess
+for $o in json-file("./src/test/resources/test_data/conf-ex.json") return $o.guess
 
 (: ensure correct output format using parantheses and commas for RDDs :)
diff --git a/src/main/resources/test_files/runtime-spark/RDDUserDefinedFunction1.jq b/src/test/resources/test_files/runtime-spark/RDDUserDefinedFunction1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RDDUserDefinedFunction1.jq
rename to src/test/resources/test_files/runtime-spark/RDDUserDefinedFunction1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RDDUserDefinedFunction2.jq b/src/test/resources/test_files/runtime-spark/RDDUserDefinedFunction2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RDDUserDefinedFunction2.jq
rename to src/test/resources/test_files/runtime-spark/RDDUserDefinedFunction2.jq
diff --git a/src/main/resources/test_files/runtime-spark/ReturnDataFrame1.jq b/src/test/resources/test_files/runtime-spark/ReturnDataFrame1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ReturnDataFrame1.jq
rename to src/test/resources/test_files/runtime-spark/ReturnDataFrame1.jq
diff --git a/src/main/resources/test_files/runtime-spark/ReturnDataFrame2.jq b/src/test/resources/test_files/runtime-spark/ReturnDataFrame2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ReturnDataFrame2.jq
rename to src/test/resources/test_files/runtime-spark/ReturnDataFrame2.jq
diff --git a/src/main/resources/test_files/runtime-spark/ReturnRDD1.jq b/src/test/resources/test_files/runtime-spark/ReturnRDD1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ReturnRDD1.jq
rename to src/test/resources/test_files/runtime-spark/ReturnRDD1.jq
diff --git a/src/main/resources/test_files/runtime-spark/ReturnRDD2.jq b/src/test/resources/test_files/runtime-spark/ReturnRDD2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ReturnRDD2.jq
rename to src/test/resources/test_files/runtime-spark/ReturnRDD2.jq
diff --git a/src/main/resources/test_files/runtime-spark/ReturnRDD3.jq b/src/test/resources/test_files/runtime-spark/ReturnRDD3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/ReturnRDD3.jq
rename to src/test/resources/test_files/runtime-spark/ReturnRDD3.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError1.jq
similarity index 63%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError1.jq
index 74959e3c78..7bd4e22fe6 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "decimal", "age": "decimal", "weight": "double", "i-should-not-exist": null}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError2.jq
similarity index 56%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError2.jq
index bf5d93672c..d615b1c2fe 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "decimal", "age": "decimal"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError3.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError3.jq
similarity index 59%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError3.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError3.jq
index e6152791f3..b8b9620f1c 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError3.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError3.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "int", "age": "int", "weight": "dou"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError4.jq
similarity index 60%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError4.jq
index bdd0544693..a009d94573 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError4.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF-SchemaError4.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "integer", "weight": "double"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF1.jq
similarity index 69%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF1.jq
index 286cb8d583..9e383a61a8 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "age" : 20, "id" : 1, "weight" : 68.8 }, { "age" : 35, "id" : 2, "weight" : 72.4 }, { "age" : 50, "id" : 3, "weight" : 76.3 })" :)
 annotate(
-    structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "decimal", "age": "decimal", "weight": "double"}
 )
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF2.jq
similarity index 85%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF2.jq
index 13150cc963..7c7c673372 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateDF2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "features" : { } }, { "label" : 1, "features" : { "0" : 0.1, "1" : 0.1, "2" : 0.1 } }, { "label" : 2, "features" : { "0" : 0.2, "1" : 0.2, "2" : 0.2 } }, { "label" : 3, "features" : { "0" : 9, "1" : 9, "2" : 9 } }, { "label" : 4, "features" : { "0" : 9.1, "1" : 9.1, "2" : 9.1 } }, { "label" : 5, "features" : { "0" : 9.2, "1" : 9.2, "2" : 9.2 } })" :)
 annotate(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-kmeans.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-kmeans.txt"),
     {"label": "double", "features": "object"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining1.jq
similarity index 85%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining1.jq
index 6d2626c70c..d0a5f7ba42 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "age" : 20, "weight" : 68.8, "binarized_weight" : 0 }, { "id" : 2, "age" : 35, "weight" : 72.4, "binarized_weight" : 1 }, { "id" : 3, "age" : 50, "weight" : 76.3, "binarized_weight" : 1 })" :)
-let $data := structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json")
+let $data := structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json")
 
 let $binarizer := get-transformer("Binarizer")
 let $intermediate-data := $binarizer($data, {"inputCol": "weight", "outputCol": "binarized_weight", "threshold": 70.0})
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining2.jq
similarity index 88%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining2.jq
index 430f1229d0..f0873ef671 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining2.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "age" : 20, "weight" : 68.8, "binarized_weight" : 0, "binarized_weight2" : 0 }, { "id" : 2, "age" : 35, "weight" : 72.4, "binarized_weight" : 1, "binarized_weight2" : 0 }, { "id" : 3, "age" : 50, "weight" : 76.3, "binarized_weight" : 1, "binarized_weight2" : 0 })" :)
-let $data := structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json")
+let $data := structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json")
 
 let $binarizer := get-transformer("Binarizer")
 let $intermediate-data := $binarizer($data, {"inputCol": "weight", "outputCol": "binarized_weight", "threshold": 70.0})
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining3.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining3.jq
similarity index 90%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining3.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining3.jq
index b4fffae5b5..c9abacacc4 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining3.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining3.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "sentence" : "Hi I heard about Spark", "tokenized" : [ "hi", "i", "heard", "about", "spark" ], "hashingTF" : { "0" : 1, "1" : 4 } }, { "id" : 2, "sentence" : "I wish Java could use case classes", "tokenized" : [ "i", "wish", "java", "could", "use", "case", "classes" ], "hashingTF" : { "0" : 1, "1" : 6 } }, { "id" : 3, "sentence" : "Logistic regression models are neat", "tokenized" : [ "logistic", "regression", "models", "are", "neat" ], "hashingTF" : { "0" : 3, "1" : 2 } })" :)
-let $data := structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-sentence.json")
+let $data := structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-sentence.json")
 
 let $tokenizer := get-transformer("Tokenizer")
 let $intermediate-data := $tokenizer($data, {"inputCol": "sentence", "outputCol": "tokenized"})
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining4.jq
similarity index 89%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining4.jq
index 7bd77fbb7f..56114249c0 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining4.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForChaining4.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "age" : 20, "weight" : 68.8, "binarized_weight" : 0, "prediction" : 1 }, { "id" : 2, "age" : 35, "weight" : 72.4, "binarized_weight" : 1, "prediction" : 0 }, { "id" : 3, "age" : 50, "weight" : 76.3, "binarized_weight" : 1, "prediction" : 0 })" :)
-let $data := structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json")
+let $data := structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json")
 
 let $binarizer := get-transformer("Binarizer")
 let $intermediate-data := $binarizer($data, {"inputCol": "weight", "outputCol": "binarized_weight", "threshold": 70.0})
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForEstimator1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForEstimator1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForEstimator1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForEstimator1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingLocalData1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingLocalData1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingLocalData1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingLocalData1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingRDDData1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingRDDData1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingRDDData1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingRDDData1.jq
index 5ebdd4e6e4..430c5802a4 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingRDDData1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForPreprocessingRDDData1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "sentence" : "i am data entry 1", "null" : null, "array" : [ 1, 2, 3 ], "binarized_age" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "sentence" : "i am data entry 2", "null" : null, "array" : [ 4, 5, 6 ], "binarized_age" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "sentence" : "i am data entry 3", "null" : null, "array" : [ 7, 8, 9 ], "binarized_age" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "sentence" : "i am data entry 4", "null" : null, "array" : [ 1, 4, 7 ], "binarized_age" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "sentence" : "i am data entry 5", "null" : null, "array" : [ 2, 5, 8 ], "binarized_age" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "sentence" : "i am data entry 6", "null" : null, "array" : [ 3, 6, 9 ], "binarized_age" : 1 })" :)
 let $data := (
-    let $rdd := json-file("./src/main/resources/queries/rumbleML/sample-ml-data-nested.json")
+    let $rdd := json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-nested.json")
     for $entry in $rdd
     let $edited := {
         "label": $entry.label,
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer2.jq
similarity index 86%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer2.jq
index 67481a0a41..7a53b2a2df 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateForTransformer2.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "sentence" : "Hi I heard about Spark", "output" : [ "hi", "i", "heard", "about", "spark" ] }, { "id" : 2, "sentence" : "I wish Java could use case classes", "output" : [ "i", "wish", "java", "could", "use", "case", "classes" ] }, { "id" : 3, "sentence" : "Logistic regression models are neat", "output" : [ "logistic", "regression", "models", "are", "neat" ] })" :)
-let $rdd-data := json-file("./src/main/resources/queries/rumbleML/sample-ml-data-sentence.json")
+let $rdd-data := json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-sentence.json")
 let $df-data := annotate($rdd-data, {"id": "integer", "sentence": "string"})
 
 let $transformer := get-transformer("Tokenizer")
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError2.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError3.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError3.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError3.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-SchemaError4.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal-TypeCasting2.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal2.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal3.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal3.jq.disabled
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal3.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal3.jq.disabled
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal4.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal5.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal5.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal5.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal6.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal6.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal6.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal7.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal7.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal7.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal8.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal8.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal8.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal9.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal9.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateLocal9.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError1.jq
similarity index 65%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError1.jq
index 8ee876b525..354bc43cba 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "integer", "weight": "decimal", "name": "string"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError2.jq
similarity index 59%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError2.jq
index 6751916bab..de3dae6f30 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "integer" }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError3.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError3.jq
similarity index 61%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError3.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError3.jq
index 49fa1caf45..d3f052a796 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError3.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError3.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "int", "age": "str", "weight": "dec"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError4.jq
similarity index 62%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError4.jq
index 92c79fdc9b..fcbfbb9c7f 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError4.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-SchemaError4.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0005"; :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "string", "weight": "decimal"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting1.jq
similarity index 75%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting1.jq
index 65acdf230e..d896cb6028 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "age" : 20, "weight" : 68 }, { "id" : 2, "age" : 35, "weight" : 72 }, { "id" : 3, "age" : 50, "weight" : 76 })" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "integer", "weight": "integer"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting2.jq
similarity index 75%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting2.jq
index 99c4977b5b..90f7b0785c 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD-TypeCasting2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "age" : 20, "weight" : 68.8 }, { "id" : 2, "age" : 35, "weight" : 72.4 }, { "id" : 3, "age" : 50, "weight" : 76.3 })" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "integer", "weight": "double"}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD1.jq
similarity index 72%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD1.jq
index 43ddae00ce..9d69d6cf59 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "id" : 1, "age" : 20, "weight" : 68.8 }, { "id" : 2, "age" : 35, "weight" : 72.4 }, { "id" : 3, "age" : 50, "weight" : 76.3 })" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json"),
     {"id": "integer", "age": "integer", "weight": "decimal"}
 )
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD2.jq
similarity index 96%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD2.jq
index b2b55503c2..562324e919 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD2.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "binaryLabel" : 0, "name" : "a", "age" : 20, "weight" : 50, "booleanCol" : false, "nullCol" : null, "stringCol" : "i am data entry 1", "stringArrayCol" : [ "i", "am", "data", "entry", "1" ], "intArrayCol" : [ 1, 2, 3 ], "doubleArrayCol" : [ 1, 2, 3 ], "doubleArrayArrayCol" : [ [ 1, 2, 3 ] ] }, { "label" : 1, "binaryLabel" : 0, "name" : "b", "age" : 21, "weight" : 55.3, "booleanCol" : false, "nullCol" : null, "stringCol" : "i am data entry 2", "stringArrayCol" : [ "i", "am", "data", "entry", "2" ], "intArrayCol" : [ 4, 5, 6 ], "doubleArrayCol" : [ 4, 5, 6 ], "doubleArrayArrayCol" : [ [ 4, 5, 6 ] ] }, { "label" : 2, "binaryLabel" : 0, "name" : "c", "age" : 22, "weight" : 60.6, "booleanCol" : false, "nullCol" : null, "stringCol" : "i am data entry 3", "stringArrayCol" : [ "i", "am", "data", "entry", "3" ], "intArrayCol" : [ 7, 8, 9 ], "doubleArrayCol" : [ 7, 8, 9 ], "doubleArrayArrayCol" : [ [ 7, 8, 9 ] ] }, { "label" : 3, "binaryLabel" : 1, "name" : "d", "age" : 23, "weight" : 65.9, "booleanCol" : true, "nullCol" : null, "stringCol" : "i am data entry 4", "stringArrayCol" : [ "i", "am", "data", "entry", "4" ], "intArrayCol" : [ 1, 4, 7 ], "doubleArrayCol" : [ 1, 4, 7 ], "doubleArrayArrayCol" : [ [ 1, 4, 7 ] ] }, { "label" : 4, "binaryLabel" : 1, "name" : "e", "age" : 24, "weight" : 70.3, "booleanCol" : true, "nullCol" : null, "stringCol" : "i am data entry 5", "stringArrayCol" : [ "i", "am", "data", "entry", "5" ], "intArrayCol" : [ 2, 5, 8 ], "doubleArrayCol" : [ 2, 5, 8 ], "doubleArrayArrayCol" : [ [ 2, 5, 8 ] ] }, { "label" : 5, "binaryLabel" : 1, "name" : "f", "age" : 25, "weight" : 75.6, "booleanCol" : true, "nullCol" : null, "stringCol" : "i am data entry 6", "stringArrayCol" : [ "i", "am", "data", "entry", "6" ], "intArrayCol" : [ 3, 6, 9 ], "doubleArrayCol" : [ 3, 6, 9 ], "doubleArrayArrayCol" : [ [ 3, 6, 9 ] ] })" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD3.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD3.jq.disabled
similarity index 75%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD3.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD3.jq.disabled
index 1b9de13a0b..584a7376f8 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD3.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD3.jq.disabled
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-date.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-date.json"),
     {
         "id": "integer",
         "birthDate": "date",
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD4.jq
similarity index 92%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD4.jq
index 74c9a4e5b8..067e067b40 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD4.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD4.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "object" : { "intarray" : [ 1, 2, 3 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 1, "object" : { "intarray" : [ 4, 5, 6 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 2, "object" : { "intarray" : [ 7, 8, 9 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 3, "object" : { "intarray" : [ 1, 4, 7 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 4, "object" : { "intarray" : [ 2, 5, 8 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 5, "object" : { "intarray" : [ 3, 6, 9 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] })" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-nested2.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-nested2.json"),
     {
         "label": "integer",
         "object": {
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD5.jq b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD5.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD5.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD5.jq
index 2d9ece45b8..87cdce4814 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD5.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/AnnotateFunction/MLAnnotateRDD5.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "object" : { "intarray" : [ 1 ], "stringarray" : [ "abc", "def" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 1, "object" : { "intarray" : [ 2, 3 ], "stringarray" : [ "abc", "a" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 2, "object" : { "intarray" : [ 4, 5, 6 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 3, "object" : { "intarray" : [ ], "stringarray" : [ "abc", "def" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 4, "object" : { "intarray" : [ 4, 5, 6 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 } ] }, { "label" : 5, "object" : { "intarray" : [ 4, 5, 6 ], "stringarray" : [ "abc" ] }, "array" : [ { "string" : "a", "decimal" : 3.5 }, { "string" : "b", "decimal" : 5 } ] })" :)
 annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-nested3.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-nested3.json"),
     {
         "label": "integer",
         "object": {
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/EstimatorTODO b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/EstimatorTODO
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/EstimatorTODO
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/EstimatorTODO
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-AFTSurvivalRegression.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-AFTSurvivalRegression.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-AFTSurvivalRegression.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-AFTSurvivalRegression.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BisectingKMeans.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BisectingKMeans.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BisectingKMeans.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BisectingKMeans.jq
index 7ddf6a2aab..a4bf733113 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BisectingKMeans.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BisectingKMeans.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BucketedRandomProjectionLSH.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BucketedRandomProjectionLSH.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BucketedRandomProjectionLSH.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BucketedRandomProjectionLSH.jq
index 0159a4a397..dff067f461 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BucketedRandomProjectionLSH.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-BucketedRandomProjectionLSH.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "hashes" : [ [ 26 ], [ 19 ], [ -26 ] ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "hashes" : [ [ 29 ], [ 21 ], [ -29 ] ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "hashes" : [ [ 31 ], [ 23 ], [ -31 ] ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "hashes" : [ [ 34 ], [ 26 ], [ -34 ] ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "hashes" : [ [ 36 ], [ 28 ], [ -36 ] ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "hashes" : [ [ 39 ], [ 30 ], [ -38 ] ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-ChiSqSelector.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-ChiSqSelector.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-ChiSqSelector.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-ChiSqSelector.jq
index d8381ea631..b943548986 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-ChiSqSelector.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-ChiSqSelector.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "selectedFeatures" : [ 50 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "selectedFeatures" : [ 55.3 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "selectedFeatures" : [ 60.6 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "selectedFeatures" : [ 65.9 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "selectedFeatures" : [ 70.3 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "selectedFeatures" : [ 75.6 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CountVectorizer.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CountVectorizer.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CountVectorizer.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CountVectorizer.jq
index dd6f104b61..19241af0e9 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CountVectorizer.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CountVectorizer.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "stringArrayCol" : [ "i", "am", "data", "entry", "1" ], "features" : { "0" : 1, "1" : 1, "2" : 1 } }, { "label" : 1, "stringArrayCol" : [ "i", "am", "data", "entry", "2" ], "features" : { "0" : 1, "1" : 1, "2" : 1 } }, { "label" : 2, "stringArrayCol" : [ "i", "am", "data", "entry", "3" ], "features" : { "0" : 1, "1" : 1, "2" : 1 } }, { "label" : 3, "stringArrayCol" : [ "i", "am", "data", "entry", "4" ], "features" : { "0" : 1, "1" : 1, "2" : 1 } }, { "label" : 4, "stringArrayCol" : [ "i", "am", "data", "entry", "5" ], "features" : { "0" : 1, "1" : 1, "2" : 1 } }, { "label" : 5, "stringArrayCol" : [ "i", "am", "data", "entry", "6" ], "features" : { "0" : 1, "1" : 1, "2" : 1 } })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CrossValidator.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CrossValidator.jq.disabled
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CrossValidator.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CrossValidator.jq.disabled
index 196611241f..016202e354 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CrossValidator.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-CrossValidator.jq.disabled
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeClassifier.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeClassifier.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeClassifier.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeClassifier.jq
index 7f1a634d65..68d180a56f 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeClassifier.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeClassifier.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeRegressor.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeRegressor.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeRegressor.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeRegressor.jq
index 242d29339c..3e891639e5 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeRegressor.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-DecisionTreeRegressor.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-FPGrowth.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-FPGrowth.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-FPGrowth.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-FPGrowth.jq
index c985ec4a26..23f752ed59 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-FPGrowth.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-FPGrowth.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "prediction" : [ "3", "4", "2", "6", "5" ] }, { "label" : 1, "name" : "b", "prediction" : [ "3", "4", "6", "5", "1" ] }, { "label" : 2, "name" : "c", "prediction" : [ "4", "2", "6", "5", "1" ] }, { "label" : 3, "name" : "d", "prediction" : [ "3", "2", "6", "5", "1" ] }, { "label" : 4, "name" : "e", "prediction" : [ "3", "4", "2", "6", "1" ] }, { "label" : 5, "name" : "f", "prediction" : [ "3", "4", "2", "5", "1" ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTClassifier.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTClassifier.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTClassifier.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTClassifier.jq
index 3db69345b1..df1f576b99 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTClassifier.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTClassifier.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "binaryLabel" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "binaryLabel" : 0, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 0 }, { "binaryLabel" : 0, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 0 }, { "binaryLabel" : 1, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "binaryLabel" : 1, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "binaryLabel" : 1, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTRegressor.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTRegressor.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTRegressor.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTRegressor.jq
index 0ad0480dbe..26dc7a2669 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTRegressor.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GBTRegressor.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GaussianMixture.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GaussianMixture.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GaussianMixture.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GaussianMixture.jq
index 48d664a413..06d10ad28c 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GaussianMixture.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GaussianMixture.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 0 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GeneralizedLinearRegression.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GeneralizedLinearRegression.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GeneralizedLinearRegression.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GeneralizedLinearRegression.jq
index 954be51d38..57694a323e 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GeneralizedLinearRegression.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-GeneralizedLinearRegression.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0.18303000252344503 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1.1206157752236088 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2.058201547923769 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 2.995787320623929 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 3.852389790502542 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 4.789975563202702 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IDF.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IDF.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IDF.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IDF.jq
index d7ede7a1cc..79a513a3f9 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IDF.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IDF.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "idf" : [ 0, 0 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "idf" : [ 0, 0 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "idf" : [ 0, 0 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "idf" : [ 0, 0 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "idf" : [ 0, 0 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "idf" : [ 0, 0 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Imputer.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Imputer.jq.disabled
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Imputer.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Imputer.jq.disabled
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IsotonicRegression.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IsotonicRegression.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IsotonicRegression.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IsotonicRegression.jq
index 1d48484a94..66725beaca 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IsotonicRegression.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-IsotonicRegression.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-KMeans1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-KMeans1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-KMeans1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-KMeans1.jq
index 7764e0f34d..2be5c8cace 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-KMeans1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-KMeans1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "binaryLabel" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 1 }, { "binaryLabel" : 0, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "binaryLabel" : 0, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 1 }, { "binaryLabel" : 1, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 0 }, { "binaryLabel" : 1, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 0 }, { "binaryLabel" : 1, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 0 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LDA.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LDA.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LDA.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LDA.jq
index e4102b2c2d..e09ded0b39 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LDA.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LDA.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "topicDistribution" : [ 0.9833443300169635, 0.0166556699830365 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "topicDistribution" : [ 0.9851674303454577, 0.01483256965454223 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "topicDistribution" : [ 0.986619424673936, 0.013380575326063963 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "topicDistribution" : [ 0.9878039575392187, 0.012196042460781317 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "topicDistribution" : [ 0.9886142429767494, 0.011385757023250669 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "topicDistribution" : [ 0.9894688632580931, 0.01053113674190688 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearRegression.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearRegression.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearRegression.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearRegression.jq
index 7f64852c33..f91ec69ee6 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearRegression.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearRegression.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0.3713412984815463 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1.2326248933307706 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2.093908488179995 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 2.955192083029223 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 3.742824821064616 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 4.604108415913839 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearSVC.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearSVC.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearSVC.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearSVC.jq
index 16fa3998f0..dd9491c074 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearSVC.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LinearSVC.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "binaryLabel" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 1 }, { "binaryLabel" : 0, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "binaryLabel" : 0, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 1 }, { "binaryLabel" : 1, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "binaryLabel" : 1, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "binaryLabel" : 1, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LogisticRegression1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LogisticRegression1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LogisticRegression1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LogisticRegression1.jq
index 530c2d9d04..4c97b99ee8 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LogisticRegression1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-LogisticRegression1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MaxAbsScaler.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MaxAbsScaler.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MaxAbsScaler.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MaxAbsScaler.jq
index 1c11bd8d89..33abd2256a 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MaxAbsScaler.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MaxAbsScaler.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "scaled" : [ 0.8, 0.6613756613756614 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "scaled" : [ 0.84, 0.7314814814814815 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "scaled" : [ 0.88, 0.8015873015873016 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "scaled" : [ 0.92, 0.8716931216931219 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "scaled" : [ 0.96, 0.9298941798941799 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "scaled" : [ 1, 1 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinHashLSH.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinHashLSH.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinHashLSH.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinHashLSH.jq
index 84151b82d5..0de052949f 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinHashLSH.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinHashLSH.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "minhashlsh" : [ [ 757939931 ] ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "minhashlsh" : [ [ 757939931 ] ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "minhashlsh" : [ [ 757939931 ] ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "minhashlsh" : [ [ 757939931 ] ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "minhashlsh" : [ [ 757939931 ] ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "minhashlsh" : [ [ 757939931 ] ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq
index 7bf258cdb9..322e889662 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "scaled" : [ 0, 0 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "scaled" : [ 0.2, 0.20703124999999994 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "scaled" : [ 0.4, 0.41406250000000017 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "scaled" : [ 0.6, 0.6210937500000003 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "scaled" : [ 0.8, 0.7929687500000001 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "scaled" : [ 1, 1 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier1.jq
similarity index 89%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier1.jq
index 1af5396c75..860f8cd04d 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier1.jq
@@ -1,5 +1,5 @@
 (:JIQS: ShouldRun; Output="({ "label" : 1, "features" : { "0" : -0.222222, "1" : 0.5, "2" : -0.762712, "3" : -0.833333 }, "prediction" : 1 }, { "label" : 1, "features" : { "0" : -0.555556, "1" : 0.25, "2" : -0.864407, "3" : -0.916667 }, "prediction" : 1 }, { "label" : 1, "features" : { "0" : -0.722222, "1" : -0.166667, "2" : -0.864407, "3" : -0.833333 }, "prediction" : 1 }, { "label" : 1, "features" : { "0" : -0.722222, "1" : 0.166667, "2" : -0.694915, "3" : -0.916667 }, "prediction" : 1 })" :)
-let $data := libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-multiclass-classification.txt")
+let $data := libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-multiclass-classification.txt")
 
 let $est := get-estimator("MultilayerPerceptronClassifier")
 let $tra := $est(
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier2.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier2.jq
index 26316ca949..90018acb98 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-MultilayerPerceptronClassifier2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 1 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 1 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-NaiveBayes.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-NaiveBayes.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-NaiveBayes.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-NaiveBayes.jq
index 9eb19721be..b71e52362b 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-NaiveBayes.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-NaiveBayes.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 1 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 2 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 3 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 4 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 5 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneHotEncoder.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneHotEncoder.jq
similarity index 95%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneHotEncoder.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneHotEncoder.jq
index 3142564688..b9a479d460 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneHotEncoder.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneHotEncoder.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "binaryLabel" : 0, "age" : 20, "enc_binaryLabel" : { "0" : 1 }, "enc_age" : { "20" : 1 } }, { "label" : 1, "name" : "b", "binaryLabel" : 0, "age" : 21, "enc_binaryLabel" : { "0" : 1 }, "enc_age" : { "21" : 1 } }, { "label" : 2, "name" : "c", "binaryLabel" : 0, "age" : 22, "enc_binaryLabel" : { "0" : 1 }, "enc_age" : { "22" : 1 } }, { "label" : 3, "name" : "d", "binaryLabel" : 1, "age" : 23, "enc_binaryLabel" : { }, "enc_age" : { "23" : 1 } }, { "label" : 4, "name" : "e", "binaryLabel" : 1, "age" : 24, "enc_binaryLabel" : { }, "enc_age" : { "24" : 1 } }, { "label" : 5, "name" : "f", "binaryLabel" : 1, "age" : 25, "enc_binaryLabel" : { }, "enc_age" : { } })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneVsRest.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneVsRest.jq.disabled
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneVsRest.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneVsRest.jq.disabled
index c80435de6d..b551b53c52 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneVsRest.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-OneVsRest.jq.disabled
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-PCA.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-PCA.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-PCA.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-PCA.jq
index 6981e9111a..c75fec4bc7 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-PCA.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-PCA.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "pca" : [ 0, 0 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "pca" : [ 0.2, 0.20703124999999994 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "pca" : [ 0.4, 0.41406250000000017 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "pca" : [ 0.6, 0.6210937500000003 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "pca" : [ 0.8, 0.7929687500000001 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "pca" : [ 1, 1 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer1.jq
index aec0afca41..7a20324017 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "qd_age" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "qd_age" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "qd_age" : 1 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "qd_age" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "qd_age" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "qd_age" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer2.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer2.jq
index 46c6ae5c22..7bb7449d00 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-QuantileDiscretizer2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "qd_age" : 0, "qd_weight" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "qd_age" : 0, "qd_weight" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "qd_age" : 1, "qd_weight" : 1 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "qd_age" : 1, "qd_weight" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "qd_age" : 1, "qd_weight" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "qd_age" : 1, "qd_weight" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RFormula.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RFormula.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RFormula.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RFormula.jq
index 11cc967ce6..46ba5ecd39 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RFormula.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RFormula.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "output_label" : null, "output_features" : [ 20, 50 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "output_label" : null, "output_features" : [ 21, 55.3 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "output_label" : null, "output_features" : [ 22, 60.6 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "output_label" : null, "output_features" : [ 23, 65.9 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "output_label" : null, "output_features" : [ 24, 70.3 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "output_label" : null, "output_features" : [ 25, 75.6 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestClassifier.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestClassifier.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestClassifier.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestClassifier.jq
index a22d838824..a3bc74c318 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestClassifier.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestClassifier.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestRegressor.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestRegressor.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestRegressor.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestRegressor.jq
index b19e9ba7e3..517b1a9fe0 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestRegressor.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-RandomForestRegressor.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0.25 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 1.15 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 2.35 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 3.25 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 4.1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 4.5 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StandardScaler.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StandardScaler.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StandardScaler.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StandardScaler.jq
index a83b1e3333..3fa7273043 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StandardScaler.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StandardScaler.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "scaled" : [ 10.690449676496975, 5.244335309537817 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "scaled" : [ 11.224972160321824, 5.800234852348826 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "scaled" : [ 11.759494644146674, 6.3561343951598355 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "scaled" : [ 12.294017127971522, 6.912033937970844 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "scaled" : [ 12.828539611796371, 7.373535445210171 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "scaled" : [ 13.36306209562122, 7.929434988021179 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StringIndexer.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StringIndexer.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StringIndexer.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StringIndexer.jq
index 6d5f9bacc6..c92b3e1a00 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StringIndexer.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-StringIndexer.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "stringCol" : "i am data entry 1", "indexedStringCol" : 0 }, { "label" : 1, "name" : "b", "stringCol" : "i am data entry 2", "indexedStringCol" : 2 }, { "label" : 2, "name" : "c", "stringCol" : "i am data entry 3", "indexedStringCol" : 4 }, { "label" : 3, "name" : "d", "stringCol" : "i am data entry 4", "indexedStringCol" : 5 }, { "label" : 4, "name" : "e", "stringCol" : "i am data entry 5", "indexedStringCol" : 1 }, { "label" : 5, "name" : "f", "stringCol" : "i am data entry 6", "indexedStringCol" : 3 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-TrainValidationSplit.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-TrainValidationSplit.jq.disabled
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-TrainValidationSplit.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-TrainValidationSplit.jq.disabled
index f887812aa1..c704a8919c 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-TrainValidationSplit.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-TrainValidationSplit.jq.disabled
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "prediction" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "prediction" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "prediction" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "prediction" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "prediction" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "prediction" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-VectorIndexer.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-VectorIndexer.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-VectorIndexer.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-VectorIndexer.jq
index 58997d352b..02224419e9 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-VectorIndexer.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-VectorIndexer.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "indexed" : [ 0, 0 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "indexed" : [ 1, 1 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "indexed" : [ 2, 2 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "indexed" : [ 3, 3 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "indexed" : [ 4, 4 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "indexed" : [ 5, 5 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Word2Vec.jq b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Word2Vec.jq
similarity index 99%
rename from src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Word2Vec.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Word2Vec.jq
index 211316536a..444807b7f4 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Word2Vec.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/EstimatorTests/MLEstimator-Word2Vec.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "stringArrayCol" : [ "i", "am", "data", "entry", "1" ], "word2vecResult" : [ -0.0011346651357598604, -0.001352090109139681, 0.002042515971697867, -0.00027955614496022463, -0.0005067271762527525, 0.00031000644667074085, -0.0015796536579728128, 0.0004464194644242525, -0.0004926592344418169, 0.0008470893139019609, 0.0002402318292297423, 0.0011481381487101316, -0.0007045801728963853, 0.001177178486250341, 0.0009850938920862972, -0.0010186877101659776, 0.00044126256834715606, 0.00043464154005050664, 0.0018460782011970878, 0.0001685149734839797, 0.00011923417914658785, 0.0016841083532199265, -0.000547420815564692, -0.0007103638607077301, -0.000034900347236543895, 0.0004699413431808353, 0.0005311910528689623, 0.0013740170979872346, -0.0008919412968680263, 0.0004560185363516212, 0.0008617917308583856, 0.0004045186360599473, 0.000005897018127143383, -0.0005451009143143893, -0.0007565773441456259, -0.002585727209225297, 0.000437815667828545, 0.00022144149188534358, 0.0017036176868714392, -0.000595445721410215, 0.0012905331852380187, 0.0001772477524355054, 0.0021392801078036427, 0.002167220483534038, 0.0014271610882133246, -0.0002575777471065521, -0.0011603923376242165, 0.00044566693250089887, 0.001143096131272614, -0.0009058970492333174, -0.0016171233815839515, -0.0018887063022702934, -0.003080601012334228, 0.0010686189052648842, 0.0018189777154475452, -0.00016037006862461569, 0.0009407310542883352, -0.00024154779966920615, 0.0006011043209582568, 0.00011587260523810984, 0.001565959071740508, -0.0006038199877366424, 0.00007889296975918115, 0.0008965555171016604, -0.0017904939748405015, -0.0004342924454249442, 0.00003686327981995419, 0.00020192144438624382, 0.00004317346320021898, 0.0007043939083814622, 0.0008723973762243987, 0.0005205528112128378, -0.00022281113779172302, 0.00034870575182139875, 0.0015593097545206548, -0.0008095198776572944, -0.0005099124740809202, 0.0020510880276560783, -0.0001529803965240717, -0.002681211772141978, -0.0016464266838738695, -0.0009084964520297945, -0.0014304797863587738, 0.0013826795388013125, 0.00017956822412088514, 0.0018978796084411444, -0.0010136742726899685, -0.0007771584641886875, 0.0015706452541053295, 0.00019846386276185514, -0.00014646907802671195, -0.0001304148347117007, 0.0011594105861149728, 0.0015778460016008468, -0.0020032057131174953, -0.0009498287225142122, 0.001764098578132689, 0.0012989745941013099, -0.0004681472666561604, 0.0007671626750379801 ] }, { "label" : 1, "name" : "b", "stringArrayCol" : [ "i", "am", "data", "entry", "2" ], "word2vecResult" : [ -0.0011346651357598604, -0.001352090109139681, 0.002042515971697867, -0.00027955614496022463, -0.0005067271762527525, 0.00031000644667074085, -0.0015796536579728128, 0.0004464194644242525, -0.0004926592344418169, 0.0008470893139019609, 0.0002402318292297423, 0.0011481381487101316, -0.0007045801728963853, 0.001177178486250341, 0.0009850938920862972, -0.0010186877101659776, 0.00044126256834715606, 0.00043464154005050664, 0.0018460782011970878, 0.0001685149734839797, 0.00011923417914658785, 0.0016841083532199265, -0.000547420815564692, -0.0007103638607077301, -0.000034900347236543895, 0.0004699413431808353, 0.0005311910528689623, 0.0013740170979872346, -0.0008919412968680263, 0.0004560185363516212, 0.0008617917308583856, 0.0004045186360599473, 0.000005897018127143383, -0.0005451009143143893, -0.0007565773441456259, -0.002585727209225297, 0.000437815667828545, 0.00022144149188534358, 0.0017036176868714392, -0.000595445721410215, 0.0012905331852380187, 0.0001772477524355054, 0.0021392801078036427, 0.002167220483534038, 0.0014271610882133246, -0.0002575777471065521, -0.0011603923376242165, 0.00044566693250089887, 0.001143096131272614, -0.0009058970492333174, -0.0016171233815839515, -0.0018887063022702934, -0.003080601012334228, 0.0010686189052648842, 0.0018189777154475452, -0.00016037006862461569, 0.0009407310542883352, -0.00024154779966920615, 0.0006011043209582568, 0.00011587260523810984, 0.001565959071740508, -0.0006038199877366424, 0.00007889296975918115, 0.0008965555171016604, -0.0017904939748405015, -0.0004342924454249442, 0.00003686327981995419, 0.00020192144438624382, 0.00004317346320021898, 0.0007043939083814622, 0.0008723973762243987, 0.0005205528112128378, -0.00022281113779172302, 0.00034870575182139875, 0.0015593097545206548, -0.0008095198776572944, -0.0005099124740809202, 0.0020510880276560783, -0.0001529803965240717, -0.002681211772141978, -0.0016464266838738695, -0.0009084964520297945, -0.0014304797863587738, 0.0013826795388013125, 0.00017956822412088514, 0.0018978796084411444, -0.0010136742726899685, -0.0007771584641886875, 0.0015706452541053295, 0.00019846386276185514, -0.00014646907802671195, -0.0001304148347117007, 0.0011594105861149728, 0.0015778460016008468, -0.0020032057131174953, -0.0009498287225142122, 0.001764098578132689, 0.0012989745941013099, -0.0004681472666561604, 0.0007671626750379801 ] }, { "label" : 2, "name" : "c", "stringArrayCol" : [ "i", "am", "data", "entry", "3" ], "word2vecResult" : [ -0.0011346651357598604, -0.001352090109139681, 0.002042515971697867, -0.00027955614496022463, -0.0005067271762527525, 0.00031000644667074085, -0.0015796536579728128, 0.0004464194644242525, -0.0004926592344418169, 0.0008470893139019609, 0.0002402318292297423, 0.0011481381487101316, -0.0007045801728963853, 0.001177178486250341, 0.0009850938920862972, -0.0010186877101659776, 0.00044126256834715606, 0.00043464154005050664, 0.0018460782011970878, 0.0001685149734839797, 0.00011923417914658785, 0.0016841083532199265, -0.000547420815564692, -0.0007103638607077301, -0.000034900347236543895, 0.0004699413431808353, 0.0005311910528689623, 0.0013740170979872346, -0.0008919412968680263, 0.0004560185363516212, 0.0008617917308583856, 0.0004045186360599473, 0.000005897018127143383, -0.0005451009143143893, -0.0007565773441456259, -0.002585727209225297, 0.000437815667828545, 0.00022144149188534358, 0.0017036176868714392, -0.000595445721410215, 0.0012905331852380187, 0.0001772477524355054, 0.0021392801078036427, 0.002167220483534038, 0.0014271610882133246, -0.0002575777471065521, -0.0011603923376242165, 0.00044566693250089887, 0.001143096131272614, -0.0009058970492333174, -0.0016171233815839515, -0.0018887063022702934, -0.003080601012334228, 0.0010686189052648842, 0.0018189777154475452, -0.00016037006862461569, 0.0009407310542883352, -0.00024154779966920615, 0.0006011043209582568, 0.00011587260523810984, 0.001565959071740508, -0.0006038199877366424, 0.00007889296975918115, 0.0008965555171016604, -0.0017904939748405015, -0.0004342924454249442, 0.00003686327981995419, 0.00020192144438624382, 0.00004317346320021898, 0.0007043939083814622, 0.0008723973762243987, 0.0005205528112128378, -0.00022281113779172302, 0.00034870575182139875, 0.0015593097545206548, -0.0008095198776572944, -0.0005099124740809202, 0.0020510880276560783, -0.0001529803965240717, -0.002681211772141978, -0.0016464266838738695, -0.0009084964520297945, -0.0014304797863587738, 0.0013826795388013125, 0.00017956822412088514, 0.0018978796084411444, -0.0010136742726899685, -0.0007771584641886875, 0.0015706452541053295, 0.00019846386276185514, -0.00014646907802671195, -0.0001304148347117007, 0.0011594105861149728, 0.0015778460016008468, -0.0020032057131174953, -0.0009498287225142122, 0.001764098578132689, 0.0012989745941013099, -0.0004681472666561604, 0.0007671626750379801 ] }, { "label" : 3, "name" : "d", "stringArrayCol" : [ "i", "am", "data", "entry", "4" ], "word2vecResult" : [ -0.0011346651357598604, -0.001352090109139681, 0.002042515971697867, -0.00027955614496022463, -0.0005067271762527525, 0.00031000644667074085, -0.0015796536579728128, 0.0004464194644242525, -0.0004926592344418169, 0.0008470893139019609, 0.0002402318292297423, 0.0011481381487101316, -0.0007045801728963853, 0.001177178486250341, 0.0009850938920862972, -0.0010186877101659776, 0.00044126256834715606, 0.00043464154005050664, 0.0018460782011970878, 0.0001685149734839797, 0.00011923417914658785, 0.0016841083532199265, -0.000547420815564692, -0.0007103638607077301, -0.000034900347236543895, 0.0004699413431808353, 0.0005311910528689623, 0.0013740170979872346, -0.0008919412968680263, 0.0004560185363516212, 0.0008617917308583856, 0.0004045186360599473, 0.000005897018127143383, -0.0005451009143143893, -0.0007565773441456259, -0.002585727209225297, 0.000437815667828545, 0.00022144149188534358, 0.0017036176868714392, -0.000595445721410215, 0.0012905331852380187, 0.0001772477524355054, 0.0021392801078036427, 0.002167220483534038, 0.0014271610882133246, -0.0002575777471065521, -0.0011603923376242165, 0.00044566693250089887, 0.001143096131272614, -0.0009058970492333174, -0.0016171233815839515, -0.0018887063022702934, -0.003080601012334228, 0.0010686189052648842, 0.0018189777154475452, -0.00016037006862461569, 0.0009407310542883352, -0.00024154779966920615, 0.0006011043209582568, 0.00011587260523810984, 0.001565959071740508, -0.0006038199877366424, 0.00007889296975918115, 0.0008965555171016604, -0.0017904939748405015, -0.0004342924454249442, 0.00003686327981995419, 0.00020192144438624382, 0.00004317346320021898, 0.0007043939083814622, 0.0008723973762243987, 0.0005205528112128378, -0.00022281113779172302, 0.00034870575182139875, 0.0015593097545206548, -0.0008095198776572944, -0.0005099124740809202, 0.0020510880276560783, -0.0001529803965240717, -0.002681211772141978, -0.0016464266838738695, -0.0009084964520297945, -0.0014304797863587738, 0.0013826795388013125, 0.00017956822412088514, 0.0018978796084411444, -0.0010136742726899685, -0.0007771584641886875, 0.0015706452541053295, 0.00019846386276185514, -0.00014646907802671195, -0.0001304148347117007, 0.0011594105861149728, 0.0015778460016008468, -0.0020032057131174953, -0.0009498287225142122, 0.001764098578132689, 0.0012989745941013099, -0.0004681472666561604, 0.0007671626750379801 ] }, { "label" : 4, "name" : "e", "stringArrayCol" : [ "i", "am", "data", "entry", "5" ], "word2vecResult" : [ -0.0011346651357598604, -0.001352090109139681, 0.002042515971697867, -0.00027955614496022463, -0.0005067271762527525, 0.00031000644667074085, -0.0015796536579728128, 0.0004464194644242525, -0.0004926592344418169, 0.0008470893139019609, 0.0002402318292297423, 0.0011481381487101316, -0.0007045801728963853, 0.001177178486250341, 0.0009850938920862972, -0.0010186877101659776, 0.00044126256834715606, 0.00043464154005050664, 0.0018460782011970878, 0.0001685149734839797, 0.00011923417914658785, 0.0016841083532199265, -0.000547420815564692, -0.0007103638607077301, -0.000034900347236543895, 0.0004699413431808353, 0.0005311910528689623, 0.0013740170979872346, -0.0008919412968680263, 0.0004560185363516212, 0.0008617917308583856, 0.0004045186360599473, 0.000005897018127143383, -0.0005451009143143893, -0.0007565773441456259, -0.002585727209225297, 0.000437815667828545, 0.00022144149188534358, 0.0017036176868714392, -0.000595445721410215, 0.0012905331852380187, 0.0001772477524355054, 0.0021392801078036427, 0.002167220483534038, 0.0014271610882133246, -0.0002575777471065521, -0.0011603923376242165, 0.00044566693250089887, 0.001143096131272614, -0.0009058970492333174, -0.0016171233815839515, -0.0018887063022702934, -0.003080601012334228, 0.0010686189052648842, 0.0018189777154475452, -0.00016037006862461569, 0.0009407310542883352, -0.00024154779966920615, 0.0006011043209582568, 0.00011587260523810984, 0.001565959071740508, -0.0006038199877366424, 0.00007889296975918115, 0.0008965555171016604, -0.0017904939748405015, -0.0004342924454249442, 0.00003686327981995419, 0.00020192144438624382, 0.00004317346320021898, 0.0007043939083814622, 0.0008723973762243987, 0.0005205528112128378, -0.00022281113779172302, 0.00034870575182139875, 0.0015593097545206548, -0.0008095198776572944, -0.0005099124740809202, 0.0020510880276560783, -0.0001529803965240717, -0.002681211772141978, -0.0016464266838738695, -0.0009084964520297945, -0.0014304797863587738, 0.0013826795388013125, 0.00017956822412088514, 0.0018978796084411444, -0.0010136742726899685, -0.0007771584641886875, 0.0015706452541053295, 0.00019846386276185514, -0.00014646907802671195, -0.0001304148347117007, 0.0011594105861149728, 0.0015778460016008468, -0.0020032057131174953, -0.0009498287225142122, 0.001764098578132689, 0.0012989745941013099, -0.0004681472666561604, 0.0007671626750379801 ] }, { "label" : 5, "name" : "f", "stringArrayCol" : [ "i", "am", "data", "entry", "6" ], "word2vecResult" : [ -0.0011346651357598604, -0.001352090109139681, 0.002042515971697867, -0.00027955614496022463, -0.0005067271762527525, 0.00031000644667074085, -0.0015796536579728128, 0.0004464194644242525, -0.0004926592344418169, 0.0008470893139019609, 0.0002402318292297423, 0.0011481381487101316, -0.0007045801728963853, 0.001177178486250341, 0.0009850938920862972, -0.0010186877101659776, 0.00044126256834715606, 0.00043464154005050664, 0.0018460782011970878, 0.0001685149734839797, 0.00011923417914658785, 0.0016841083532199265, -0.000547420815564692, -0.0007103638607077301, -0.000034900347236543895, 0.0004699413431808353, 0.0005311910528689623, 0.0013740170979872346, -0.0008919412968680263, 0.0004560185363516212, 0.0008617917308583856, 0.0004045186360599473, 0.000005897018127143383, -0.0005451009143143893, -0.0007565773441456259, -0.002585727209225297, 0.000437815667828545, 0.00022144149188534358, 0.0017036176868714392, -0.000595445721410215, 0.0012905331852380187, 0.0001772477524355054, 0.0021392801078036427, 0.002167220483534038, 0.0014271610882133246, -0.0002575777471065521, -0.0011603923376242165, 0.00044566693250089887, 0.001143096131272614, -0.0009058970492333174, -0.0016171233815839515, -0.0018887063022702934, -0.003080601012334228, 0.0010686189052648842, 0.0018189777154475452, -0.00016037006862461569, 0.0009407310542883352, -0.00024154779966920615, 0.0006011043209582568, 0.00011587260523810984, 0.001565959071740508, -0.0006038199877366424, 0.00007889296975918115, 0.0008965555171016604, -0.0017904939748405015, -0.0004342924454249442, 0.00003686327981995419, 0.00020192144438624382, 0.00004317346320021898, 0.0007043939083814622, 0.0008723973762243987, 0.0005205528112128378, -0.00022281113779172302, 0.00034870575182139875, 0.0015593097545206548, -0.0008095198776572944, -0.0005099124740809202, 0.0020510880276560783, -0.0001529803965240717, -0.002681211772141978, -0.0016464266838738695, -0.0009084964520297945, -0.0014304797863587738, 0.0013826795388013125, 0.00017956822412088514, 0.0018978796084411444, -0.0010136742726899685, -0.0007771584641886875, 0.0015706452541053295, 0.00019846386276185514, -0.00014646907802671195, -0.0001304148347117007, 0.0011594105861149728, 0.0015778460016008468, -0.0020032057131174953, -0.0009498287225142122, 0.001764098578132689, 0.0012989745941013099, -0.0004681472666561604, 0.0007671626750379801 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error1.jq
similarity index 56%
rename from src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error1.jq
index 6a6a36b41d..ceff16cd01 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error1.jq
@@ -1,11 +1,11 @@
 (:JIQS: ShouldCrash; ErrorCode="FORG0006"; :)
 let $est := get-estimator("LogisticRegression")
 let $tra := $est(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     {"featuresCol": "label"}
 )
 let $res := $tra(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     { }
 )
 return $res
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error2.jq
similarity index 57%
rename from src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error2.jq
index 86343da5df..1dfce35b13 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error2.jq
@@ -1,11 +1,11 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0003"; :)
 let $est := get-estimator("LogisticRegression")
 let $tra := $est(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     {"featuresCol": ["does not exist"]}
 )
 let $res := $tra(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     { }
 )
 return $res
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error3.jq b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error3.jq
similarity index 60%
rename from src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error3.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error3.jq
index 59041cef53..5dc1bce2db 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error3.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization-Error3.jq
@@ -1,11 +1,11 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0003"; :)
 let $est := get-estimator("LogisticRegression")
 let $tra := $est(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     {"featuresCol": [3] }
 )
 let $res := $tra(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     { }
 )
 return $res
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization1.jq
similarity index 76%
rename from src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization1.jq
index 8f964ce56c..b0d6d83d98 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization1.jq
@@ -1,11 +1,11 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "prediction" : 0 }, { "label" : 1, "prediction" : 1 }, { "label" : 1, "prediction" : 1 }, { "label" : 1, "prediction" : 1 }, { "label" : 1, "prediction" : 1 })" :)
 let $est := get-estimator("LogisticRegression")
 let $tra := $est(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     {"featuresCol": ["features"]}
 )
 for $resultRow in $tra(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     {"featuresCol": ["features"] }
 )
 return {
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization2.jq
similarity index 74%
rename from src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization2.jq
index 4fd6be6c4e..49bc39c78b 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/FeatureVectorization/MLFeatureVectorization2.jq
@@ -1,11 +1,11 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "prediction" : 0 }, { "label" : 1, "prediction" : 1 }, { "label" : 1, "prediction" : 1 }, { "label" : 1, "prediction" : 1 }, { "label" : 1, "prediction" : 1 })" :)
 let $est := get-estimator("LogisticRegression")
 let $tra := $est(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     { }
 )
 for $resultRow in $tra(
-    libsvm-file("./src/main/resources/queries/rumbleML/sample-libsvm-data-short.txt"),
+    libsvm-file("./src/test/resources/test_data/rumbleML/sample-libsvm-data-short.txt"),
     { }
 )
 return {
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLDecimalTypeError1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLDecimalTypeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLDecimalTypeError1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLDecimalTypeError1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error1.jq
similarity index 69%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error1.jq
index 131499512b..6b88fa7b07 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0004"; :)
 let $estimator := get-estimator("KMeans")
-let $rdd-data := json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json")
+let $rdd-data := json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json")
 return ($estimator(
     $rdd-data,
     {
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error2.jq
similarity index 72%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error2.jq
index 555b061b8b..2c6f0aaae6 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/MLNonDF-Error2.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0004"; :)
 let $transformer := get-transformer("VectorAssembler")
-let $rdd-data := json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json")
+let $rdd-data := json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json")
 for $i in $transformer(
   $rdd-data,
   {"inputCols": ["age", "weight"], "outputCol": "features"}
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError1.jq
similarity index 64%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLParamError1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLParamError1.jq
index b2202d7721..2645a2aaf1 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError1.jq
@@ -1,7 +1,7 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0003"; :)
 let $hashingTF := get-transformer("HashingTF")
 return $hashingTF(
-    (structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-sentence.json")),
+    (structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-sentence.json")),
     {"inputCol": 123, "numFeatures": 2}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError2.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError2.jq
similarity index 65%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLParamError2.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLParamError2.jq
index debb50e80b..2ae8845007 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError2.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError2.jq
@@ -1,7 +1,7 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0003"; :)
 let $hashingTF := get-transformer("HashingTF")
 return $hashingTF(
-    (structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-sentence.json")),
+    (structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-sentence.json")),
     {"inputCol": "sentence", "numFeatures": 2}
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError3.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError3.jq
similarity index 72%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLParamError3.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLParamError3.jq
index 1871411537..d29923dd1a 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError3.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError3.jq
@@ -1,7 +1,7 @@
 (:JIQS: ShouldCrash; ErrorCode="RBML0003"; :)
 let $transformer := get-transformer("VectorAssembler")
 for $i in $transformer(
-  (structured-json-file("./src/main/resources/queries/rumbleML/sample-ml-data-age-weight.json")),
+  (structured-json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-age-weight.json")),
   {"inputCols": ["age", 3], "outputCol": "features"}
 )
 return $i
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/MLParamError4.jq b/src/test/resources/test_files/runtime-spark/RumbleML/MLParamError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/MLParamError4.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/MLParamError4.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Binarizer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Binarizer1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Binarizer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Binarizer1.jq
index a85e810691..3151a1542c 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Binarizer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Binarizer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "binarized_weight" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "binarized_weight" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "binarized_weight" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "binarized_weight" : 0 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "binarized_weight" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "binarized_weight" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Bucketizer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Bucketizer1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Bucketizer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Bucketizer1.jq
index f6348103e9..a6c8ac0121 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Bucketizer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Bucketizer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "bucketized_weight" : 0 }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "bucketized_weight" : 0 }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "bucketized_weight" : 0 }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "bucketized_weight" : 1 }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "bucketized_weight" : 1 }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "bucketized_weight" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-DiscreteCosineTransform(DCT)1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-DiscreteCosineTransform(DCT)1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-DiscreteCosineTransform(DCT)1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-DiscreteCosineTransform(DCT)1.jq
index b0c42810e0..27e2afce92 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-DiscreteCosineTransform(DCT)1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-DiscreteCosineTransform(DCT)1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "binaryLabel" : 0, "name" : "a", "age" : 20, "weight" : 50, "dct_output" : [ 49.49747468305832, -21.213203435596427 ] }, { "binaryLabel" : 0, "name" : "b", "age" : 21, "weight" : 55.3, "dct_output" : [ 53.95224740453357, -24.25376259469858 ] }, { "binaryLabel" : 0, "name" : "c", "age" : 22, "weight" : 60.6, "dct_output" : [ 58.40702012600882, -27.294321753800737 ] }, { "binaryLabel" : 1, "name" : "d", "age" : 23, "weight" : 65.9, "dct_output" : [ 62.861792847484075, -30.334880912902896 ] }, { "binaryLabel" : 1, "name" : "e", "age" : 24, "weight" : 70.3, "dct_output" : [ 66.68016946589142, -32.73904396893715 ] }, { "binaryLabel" : 1, "name" : "f", "age" : 25, "weight" : 75.6, "dct_output" : [ 71.13494218736668, -35.779603128039305 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-ElementwiseProduct1.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-ElementwiseProduct1.jq.disabled
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-ElementwiseProduct1.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-ElementwiseProduct1.jq.disabled
index e28da11e04..c8e25a8729 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-ElementwiseProduct1.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-ElementwiseProduct1.jq.disabled
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "binaryLabel" : null, "name" : "a", "age" : 20, "weight" : 50, "bucketized_weight" : 0 }, { "binaryLabel" : null, "name" : "b", "age" : 21, "weight" : 55.3, "bucketized_weight" : 0 }, { "binaryLabel" : null, "name" : "c", "age" : 22, "weight" : 60.6, "bucketized_weight" : 0 }, { "binaryLabel" : null, "name" : "d", "age" : 23, "weight" : 65.9, "bucketized_weight" : 1 }, { "binaryLabel" : null, "name" : "e", "age" : 24, "weight" : 70.3, "bucketized_weight" : 1 }, { "binaryLabel" : null, "name" : "f", "age" : 25, "weight" : 75.6, "bucketized_weight" : 1 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-FeatureHasher1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-FeatureHasher1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-FeatureHasher1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-FeatureHasher1.jq
index 9cae48a6d0..8c8337f0ef 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-FeatureHasher1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-FeatureHasher1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "name" : "a", "age" : 20, "weight" : 50, "booleanCol" : false, "hashed" : { "34087" : 1, "68404" : 50, "121715" : 1, "147703" : 20 } }, { "name" : "b", "age" : 21, "weight" : 55.3, "booleanCol" : false, "hashed" : { "34087" : 1, "68404" : 55.3, "118564" : 1, "147703" : 21 } }, { "name" : "c", "age" : 22, "weight" : 60.6, "booleanCol" : false, "hashed" : { "34087" : 1, "61149" : 1, "68404" : 60.6, "147703" : 22 } }, { "name" : "d", "age" : 23, "weight" : 65.9, "booleanCol" : true, "hashed" : { "48961" : 1, "68404" : 65.9, "147703" : 23, "227025" : 1 } }, { "name" : "e", "age" : 24, "weight" : 70.3, "booleanCol" : true, "hashed" : { "68404" : 70.3, "147703" : 24, "171510" : 1, "227025" : 1 } }, { "name" : "f", "age" : 25, "weight" : 75.6, "booleanCol" : true, "hashed" : { "61092" : 1, "68404" : 75.6, "147703" : 25, "227025" : 1 } })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-HashingTF1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-HashingTF1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-HashingTF1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-HashingTF1.jq
index 21249d48c8..0e6d1e2321 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-HashingTF1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-HashingTF1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "stringArrayCol" : [ "i", "am", "data", "entry", "1" ], "hashingtf" : { "4" : 1, "7" : 1, "9" : 1, "13" : 1, "15" : 1 } }, { "label" : 1, "stringArrayCol" : [ "i", "am", "data", "entry", "2" ], "hashingtf" : { "7" : 1, "9" : 2, "13" : 1, "15" : 1 } }, { "label" : 2, "stringArrayCol" : [ "i", "am", "data", "entry", "3" ], "hashingtf" : { "7" : 1, "9" : 1, "13" : 1, "15" : 1, "18" : 1 } }, { "label" : 3, "stringArrayCol" : [ "i", "am", "data", "entry", "4" ], "hashingtf" : { "6" : 1, "7" : 1, "9" : 1, "13" : 1, "15" : 1 } }, { "label" : 4, "stringArrayCol" : [ "i", "am", "data", "entry", "5" ], "hashingtf" : { "7" : 1, "9" : 2, "13" : 1, "15" : 1 } }, { "label" : 5, "stringArrayCol" : [ "i", "am", "data", "entry", "6" ], "hashingtf" : { "7" : 1, "9" : 1, "13" : 1, "15" : 2 } })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-IndexToString1.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-IndexToString1.jq.disabled
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-IndexToString1.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-IndexToString1.jq.disabled
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction1.jq
index 0dc68ed0de..1ab4549505 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "interaction" : [ 1000 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "interaction" : [ 1161.3 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "interaction" : [ 1333.2 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "interaction" : [ 1515.7 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "interaction" : [ 1687.1999999999998 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "interaction" : [ 1889.9999999999998 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction2.jq.disabled b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction2.jq.disabled
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction2.jq.disabled
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction2.jq.disabled
index f8f79b6314..a61cf6345e 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction2.jq.disabled
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Interaction2.jq.disabled
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="(({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "interaction" : [ 1000 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "interaction" : [ 1161.3 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "interaction" : [ 1333.2 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "interaction" : [ 1515.7 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "interaction" : [ 1687.1999999999998 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "interaction" : [ 1889.9999999999998 ] }))" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-NGram1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-NGram1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-NGram1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-NGram1.jq
index 09aa9cb002..a1ead67a7d 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-NGram1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-NGram1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "stringArrayCol" : [ "i", "am", "data", "entry", "1" ], "output" : [ "i am", "am data", "data entry", "entry 1" ] }, { "label" : 1, "stringArrayCol" : [ "i", "am", "data", "entry", "2" ], "output" : [ "i am", "am data", "data entry", "entry 2" ] }, { "label" : 2, "stringArrayCol" : [ "i", "am", "data", "entry", "3" ], "output" : [ "i am", "am data", "data entry", "entry 3" ] }, { "label" : 3, "stringArrayCol" : [ "i", "am", "data", "entry", "4" ], "output" : [ "i am", "am data", "data entry", "entry 4" ] }, { "label" : 4, "stringArrayCol" : [ "i", "am", "data", "entry", "5" ], "output" : [ "i am", "am data", "data entry", "entry 5" ] }, { "label" : 5, "stringArrayCol" : [ "i", "am", "data", "entry", "6" ], "output" : [ "i am", "am data", "data entry", "entry 6" ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Normalizer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Normalizer1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Normalizer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Normalizer1.jq
index c3ce903f48..e950b0965e 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Normalizer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Normalizer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "age" : 20, "weight" : 50, "output" : [ 0.2857142857142857, 0.7142857142857143 ] }, { "label" : 1, "age" : 21, "weight" : 55.3, "output" : [ 0.27522935779816515, 0.7247706422018348 ] }, { "label" : 2, "age" : 22, "weight" : 60.6, "output" : [ 0.26634382566585957, 0.7336561743341405 ] }, { "label" : 3, "age" : 23, "weight" : 65.9, "output" : [ 0.2587176602924634, 0.7412823397075365 ] }, { "label" : 4, "age" : 24, "weight" : 70.3, "output" : [ 0.25450689289501593, 0.7454931071049841 ] }, { "label" : 5, "age" : 25, "weight" : 75.6, "output" : [ 0.2485089463220676, 0.7514910536779323 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-PolynomialExpansion1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-PolynomialExpansion1.jq
similarity index 94%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-PolynomialExpansion1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-PolynomialExpansion1.jq
index 811d10b0ac..58b1761a08 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-PolynomialExpansion1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-PolynomialExpansion1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "age" : 20, "weight" : 50, "output" : [ 20, 400, 8000, 50, 1000, 20000, 2500, 50000, 125000 ] }, { "label" : 1, "age" : 21, "weight" : 55.3, "output" : [ 21, 441, 9261, 55.3, 1161.3, 24387.3, 3058.0899999999997, 64219.88999999999, 169112.37699999998 ] }, { "label" : 2, "age" : 22, "weight" : 60.6, "output" : [ 22, 484, 10648, 60.6, 1333.2, 29330.4, 3672.36, 80791.92, 222545.016 ] }, { "label" : 3, "age" : 23, "weight" : 65.9, "output" : [ 23, 529, 12167, 65.9, 1515.7, 34861.1, 4342.81, 99884.63, 286191.17900000006 ] }, { "label" : 4, "age" : 24, "weight" : 70.3, "output" : [ 24, 576, 13824, 70.3, 1687.1999999999998, 40492.799999999996, 4942.089999999999, 118610.15999999997, 347428.9269999999 ] }, { "label" : 5, "age" : 25, "weight" : 75.6, "output" : [ 25, 625, 15625, 75.6, 1889.9999999999998, 47249.99999999999, 5715.359999999999, 142883.99999999997, 432081.2159999999 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-RegexTokenizer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-RegexTokenizer1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-RegexTokenizer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-RegexTokenizer1.jq
index 0ade24ee04..c54d5f84b5 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-RegexTokenizer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-RegexTokenizer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "stringCol" : "i am data entry 1", "output" : [ "i", "am", "data", "entry", "1" ] }, { "label" : 1, "stringCol" : "i am data entry 2", "output" : [ "i", "am", "data", "entry", "2" ] }, { "label" : 2, "stringCol" : "i am data entry 3", "output" : [ "i", "am", "data", "entry", "3" ] }, { "label" : 3, "stringCol" : "i am data entry 4", "output" : [ "i", "am", "data", "entry", "4" ] }, { "label" : 4, "stringCol" : "i am data entry 5", "output" : [ "i", "am", "data", "entry", "5" ] }, { "label" : 5, "stringCol" : "i am data entry 6", "output" : [ "i", "am", "data", "entry", "6" ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-SQLTransformer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-SQLTransformer1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-SQLTransformer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-SQLTransformer1.jq
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-StopWordsRemover1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-StopWordsRemover1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-StopWordsRemover1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-StopWordsRemover1.jq
index 7ea09d18f5..ab139bf7d8 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-StopWordsRemover1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-StopWordsRemover1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "stringArrayCol" : [ "i", "am", "data", "entry", "1" ], "output" : [ "data", "entry", "1" ] }, { "label" : 1, "stringArrayCol" : [ "i", "am", "data", "entry", "2" ], "output" : [ "data", "entry", "2" ] }, { "label" : 2, "stringArrayCol" : [ "i", "am", "data", "entry", "3" ], "output" : [ "data", "entry", "3" ] }, { "label" : 3, "stringArrayCol" : [ "i", "am", "data", "entry", "4" ], "output" : [ "data", "entry", "4" ] }, { "label" : 4, "stringArrayCol" : [ "i", "am", "data", "entry", "5" ], "output" : [ "data", "entry", "5" ] }, { "label" : 5, "stringArrayCol" : [ "i", "am", "data", "entry", "6" ], "output" : [ "data", "entry", "6" ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Tokenizer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Tokenizer1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Tokenizer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Tokenizer1.jq
index baf63c18f9..66c87fabea 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Tokenizer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-Tokenizer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "stringCol" : "i am data entry 1", "output" : [ "i", "am", "data", "entry", "1" ] }, { "label" : 1, "stringCol" : "i am data entry 2", "output" : [ "i", "am", "data", "entry", "2" ] }, { "label" : 2, "stringCol" : "i am data entry 3", "output" : [ "i", "am", "data", "entry", "3" ] }, { "label" : 3, "stringCol" : "i am data entry 4", "output" : [ "i", "am", "data", "entry", "4" ] }, { "label" : 4, "stringCol" : "i am data entry 5", "output" : [ "i", "am", "data", "entry", "5" ] }, { "label" : 5, "stringCol" : "i am data entry 6", "output" : [ "i", "am", "data", "entry", "6" ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorAssembler1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorAssembler1.jq
similarity index 93%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorAssembler1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorAssembler1.jq
index 4f742d419d..23c5fb0e39 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorAssembler1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorAssembler1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "features" : [ 20, 50 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "features" : [ 21, 55.3 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "features" : [ 22, 60.6 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "features" : [ 23, 65.9 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "features" : [ 24, 70.3 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "features" : [ 25, 75.6 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSizeHint1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSizeHint1.jq
similarity index 91%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSizeHint1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSizeHint1.jq
index 2215ae2144..313b314fb4 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSizeHint1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSizeHint1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "age" : 20, "weight" : 50 }, { "label" : 1, "age" : 21, "weight" : 55.3 }, { "label" : 2, "age" : 22, "weight" : 60.6 }, { "label" : 3, "age" : 23, "weight" : 65.9 }, { "label" : 4, "age" : 24, "weight" : 70.3 }, { "label" : 5, "age" : 25, "weight" : 75.6 })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSlicer1.jq b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSlicer1.jq
similarity index 92%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSlicer1.jq
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSlicer1.jq
index 5c978e395e..319e68ef10 100644
--- a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSlicer1.jq
+++ b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/MLTransformer-VectorSlicer1.jq
@@ -1,6 +1,6 @@
 (:JIQS: ShouldRun; Output="({ "label" : 0, "age" : 20, "weight" : 50, "output" : [ 50 ] }, { "label" : 1, "age" : 21, "weight" : 55.3, "output" : [ 55.3 ] }, { "label" : 2, "age" : 22, "weight" : 60.6, "output" : [ 60.6 ] }, { "label" : 3, "age" : 23, "weight" : 65.9, "output" : [ 65.9 ] }, { "label" : 4, "age" : 24, "weight" : 70.3, "output" : [ 70.3 ] }, { "label" : 5, "age" : 25, "weight" : 75.6, "output" : [ 75.6 ] })" :)
 let $data := annotate(
-    json-file("./src/main/resources/queries/rumbleML/sample-ml-data-flat.json"),
+    json-file("./src/test/resources/test_data/rumbleML/sample-ml-data-flat.json"),
     { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"],  "doubleArrayCol": ["double"],  "doubleArrayArrayCol": [["double"]] }
 )
 
diff --git a/src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/TransformerTODO b/src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/TransformerTODO
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/RumbleML/TransformerTests/TransformerTODO
rename to src/test/resources/test_files/runtime-spark/RumbleML/TransformerTests/TransformerTODO
diff --git a/src/main/resources/test_files/runtime-spark/SimpleLets.jq b/src/test/resources/test_files/runtime-spark/SimpleLets.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/SimpleLets.jq
rename to src/test/resources/test_files/runtime-spark/SimpleLets.jq
diff --git a/src/main/resources/test_files/runtime-spark/TakeRdd.jq b/src/test/resources/test_files/runtime-spark/TakeRdd.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/TakeRdd.jq
rename to src/test/resources/test_files/runtime-spark/TakeRdd.jq
diff --git a/src/main/resources/test_files/runtime-spark/Typeswitch.jq b/src/test/resources/test_files/runtime-spark/Typeswitch.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Typeswitch.jq
rename to src/test/resources/test_files/runtime-spark/Typeswitch.jq
diff --git a/src/main/resources/test_files/runtime-spark/Where.jq b/src/test/resources/test_files/runtime-spark/Where.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/Where.jq
rename to src/test/resources/test_files/runtime-spark/Where.jq
diff --git a/src/main/resources/test_files/runtime-spark/WhereFalseAndEmpty.jq b/src/test/resources/test_files/runtime-spark/WhereFalseAndEmpty.jq
similarity index 100%
rename from src/main/resources/test_files/runtime-spark/WhereFalseAndEmpty.jq
rename to src/test/resources/test_files/runtime-spark/WhereFalseAndEmpty.jq
diff --git a/src/main/resources/test_files/runtime-spark/WhereJson.jq b/src/test/resources/test_files/runtime-spark/WhereJson.jq
similarity index 59%
rename from src/main/resources/test_files/runtime-spark/WhereJson.jq
rename to src/test/resources/test_files/runtime-spark/WhereJson.jq
index 18aeb5a126..647e512091 100644
--- a/src/main/resources/test_files/runtime-spark/WhereJson.jq
+++ b/src/test/resources/test_files/runtime-spark/WhereJson.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="(Latvian, Russian)" :)
-for $i in json-file("./src/main/resources/queries/conf-ex.json")
+for $i in json-file("./src/test/resources/test_data/conf-ex.json")
 where $i."target" eq "Russian"
 return $i."guess"
\ No newline at end of file
diff --git a/src/main/resources/test_files/runtime/Array.jq b/src/test/resources/test_files/runtime/Array.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Array.jq
rename to src/test/resources/test_files/runtime/Array.jq
diff --git a/src/main/resources/test_files/runtime/Array2.jq b/src/test/resources/test_files/runtime/Array2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Array2.jq
rename to src/test/resources/test_files/runtime/Array2.jq
diff --git a/src/main/resources/test_files/runtime/Arrow1.jq b/src/test/resources/test_files/runtime/Arrow1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Arrow1.jq
rename to src/test/resources/test_files/runtime/Arrow1.jq
diff --git a/src/main/resources/test_files/runtime/Arrow2.jq b/src/test/resources/test_files/runtime/Arrow2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Arrow2.jq
rename to src/test/resources/test_files/runtime/Arrow2.jq
diff --git a/src/main/resources/test_files/runtime/Arrow3.jq b/src/test/resources/test_files/runtime/Arrow3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Arrow3.jq
rename to src/test/resources/test_files/runtime/Arrow3.jq
diff --git a/src/main/resources/test_files/runtime/Arrow4.jq b/src/test/resources/test_files/runtime/Arrow4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Arrow4.jq
rename to src/test/resources/test_files/runtime/Arrow4.jq
diff --git a/src/main/resources/test_files/runtime/Cast.jq b/src/test/resources/test_files/runtime/Cast.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Cast.jq
rename to src/test/resources/test_files/runtime/Cast.jq
diff --git a/src/main/resources/test_files/runtime/CastAnyURIs.jq b/src/test/resources/test_files/runtime/CastAnyURIs.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastAnyURIs.jq
rename to src/test/resources/test_files/runtime/CastAnyURIs.jq
diff --git a/src/main/resources/test_files/runtime/CastBinaries.jq b/src/test/resources/test_files/runtime/CastBinaries.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastBinaries.jq
rename to src/test/resources/test_files/runtime/CastBinaries.jq
diff --git a/src/main/resources/test_files/runtime/CastDateTimes.jq b/src/test/resources/test_files/runtime/CastDateTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastDateTimes.jq
rename to src/test/resources/test_files/runtime/CastDateTimes.jq
diff --git a/src/main/resources/test_files/runtime/CastDurations.jq b/src/test/resources/test_files/runtime/CastDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastDurations.jq
rename to src/test/resources/test_files/runtime/CastDurations.jq
diff --git a/src/main/resources/test_files/runtime/CastError1.jq b/src/test/resources/test_files/runtime/CastError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastError1.jq
rename to src/test/resources/test_files/runtime/CastError1.jq
diff --git a/src/main/resources/test_files/runtime/CastError2.jq b/src/test/resources/test_files/runtime/CastError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastError2.jq
rename to src/test/resources/test_files/runtime/CastError2.jq
diff --git a/src/main/resources/test_files/runtime/CastError3.jq b/src/test/resources/test_files/runtime/CastError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastError3.jq
rename to src/test/resources/test_files/runtime/CastError3.jq
diff --git a/src/main/resources/test_files/runtime/CastNull.jq b/src/test/resources/test_files/runtime/CastNull.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastNull.jq
rename to src/test/resources/test_files/runtime/CastNull.jq
diff --git a/src/main/resources/test_files/runtime/Castable.jq b/src/test/resources/test_files/runtime/Castable.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Castable.jq
rename to src/test/resources/test_files/runtime/Castable.jq
diff --git a/src/main/resources/test_files/runtime/CastableAnyURI.jq b/src/test/resources/test_files/runtime/CastableAnyURI.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableAnyURI.jq
rename to src/test/resources/test_files/runtime/CastableAnyURI.jq
diff --git a/src/main/resources/test_files/runtime/CastableBinaries.jq b/src/test/resources/test_files/runtime/CastableBinaries.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableBinaries.jq
rename to src/test/resources/test_files/runtime/CastableBinaries.jq
diff --git a/src/main/resources/test_files/runtime/CastableDateTimes.jq b/src/test/resources/test_files/runtime/CastableDateTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableDateTimes.jq
rename to src/test/resources/test_files/runtime/CastableDateTimes.jq
diff --git a/src/main/resources/test_files/runtime/CastableDurations.jq b/src/test/resources/test_files/runtime/CastableDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableDurations.jq
rename to src/test/resources/test_files/runtime/CastableDurations.jq
diff --git a/src/main/resources/test_files/runtime/CastableError1.jq b/src/test/resources/test_files/runtime/CastableError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableError1.jq
rename to src/test/resources/test_files/runtime/CastableError1.jq
diff --git a/src/main/resources/test_files/runtime/CastableError2.jq b/src/test/resources/test_files/runtime/CastableError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableError2.jq
rename to src/test/resources/test_files/runtime/CastableError2.jq
diff --git a/src/main/resources/test_files/runtime/CastableError3.jq b/src/test/resources/test_files/runtime/CastableError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableError3.jq
rename to src/test/resources/test_files/runtime/CastableError3.jq
diff --git a/src/main/resources/test_files/runtime/CastableNull.jq b/src/test/resources/test_files/runtime/CastableNull.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CastableNull.jq
rename to src/test/resources/test_files/runtime/CastableNull.jq
diff --git a/src/main/resources/test_files/runtime/CommaExpression1.jq b/src/test/resources/test_files/runtime/CommaExpression1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CommaExpression1.jq
rename to src/test/resources/test_files/runtime/CommaExpression1.jq
diff --git a/src/main/resources/test_files/runtime/CommaExpression2.jq b/src/test/resources/test_files/runtime/CommaExpression2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/CommaExpression2.jq
rename to src/test/resources/test_files/runtime/CommaExpression2.jq
diff --git a/src/main/resources/test_files/runtime/ComposableKeys.jq b/src/test/resources/test_files/runtime/ComposableKeys.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ComposableKeys.jq
rename to src/test/resources/test_files/runtime/ComposableKeys.jq
diff --git a/src/main/resources/test_files/runtime/ContextExpr.jq b/src/test/resources/test_files/runtime/ContextExpr.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ContextExpr.jq
rename to src/test/resources/test_files/runtime/ContextExpr.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr1.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr1.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr1.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr10.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr10.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr10.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr11.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr11.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr11.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr12.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr12.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr12.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr13.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr13.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr13.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr14.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr14.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr14.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr2.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr2.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr2.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr3.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr3.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr3.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr4.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr4.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr4.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr5.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr5.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr5.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr6.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr6.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr6.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr7.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr7.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr7.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr8.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr8.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr8.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExpr9.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExpr9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExpr9.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExpr9.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExprError1.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExprError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExprError1.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExprError1.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExprError2.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExprError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExprError2.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExprError2.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/IfExprError3.jq b/src/test/resources/test_files/runtime/ControlIterators/IfExprError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/IfExprError3.jq
rename to src/test/resources/test_files/runtime/ControlIterators/IfExprError3.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpression1.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpression1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpression1.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpression1.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpression2.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpression2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpression2.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpression2.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpression3.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpression3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpression3.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpression3.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpression4.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpression4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpression4.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpression4.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError1.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError1.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError1.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError2.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError2.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError2.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError3.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError3.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError3.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError4.jq b/src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/SwitchExpressionError4.jq
rename to src/test/resources/test_files/runtime/ControlIterators/SwitchExpressionError4.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression1.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression1.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression1.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression2.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression2.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression2.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression3.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression3.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression3.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression4.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression4.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression4.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression5.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression5.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression5.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression6.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression6.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression6.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression7.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression7.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression7.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression8.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression8.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression8.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression9.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpression9.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpression9.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError1.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError1.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError1.jq
diff --git a/src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError2.jq b/src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError2.jq
rename to src/test/resources/test_files/runtime/ControlIterators/TypeswitchExpressionError2.jq
diff --git a/src/main/resources/test_files/runtime/ErrorDuplicateKeys.jq b/src/test/resources/test_files/runtime/ErrorDuplicateKeys.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ErrorDuplicateKeys.jq
rename to src/test/resources/test_files/runtime/ErrorDuplicateKeys.jq
diff --git a/src/main/resources/test_files/runtime/ErrorInvalidArrayLookup.jq b/src/test/resources/test_files/runtime/ErrorInvalidArrayLookup.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ErrorInvalidArrayLookup.jq
rename to src/test/resources/test_files/runtime/ErrorInvalidArrayLookup.jq
diff --git a/src/main/resources/test_files/runtime/ErrorInvalidArrayLookup2.jq b/src/test/resources/test_files/runtime/ErrorInvalidArrayLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ErrorInvalidArrayLookup2.jq
rename to src/test/resources/test_files/runtime/ErrorInvalidArrayLookup2.jq
diff --git a/src/main/resources/test_files/runtime/ErrorModuleImport.jq b/src/test/resources/test_files/runtime/ErrorModuleImport.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ErrorModuleImport.jq
rename to src/test/resources/test_files/runtime/ErrorModuleImport.jq
diff --git a/src/main/resources/test_files/runtime/ErrorNonStringKey.jq b/src/test/resources/test_files/runtime/ErrorNonStringKey.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ErrorNonStringKey.jq
rename to src/test/resources/test_files/runtime/ErrorNonStringKey.jq
diff --git a/src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI1.jq b/src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI1.jq
rename to src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI2.jq b/src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI2.jq
rename to src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURI2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError1.jq b/src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError1.jq
rename to src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError2.jq b/src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError2.jq
rename to src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError3.jq b/src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError3.jq
rename to src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError4.jq b/src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError4.jq
rename to src/test/resources/test_files/runtime/FunctionAnyURI/FunctionAnyURIError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant1.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant1.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant2.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant2.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant3.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant3.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant4.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant4.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant5.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant5.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayDescendant5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten1.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten1.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten2.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten2.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten3.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten3.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten4.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten4.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten5.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten5.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayFlatten5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers1.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers1.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers2.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers2.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers3.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers3.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers4.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers4.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers5.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArrayMembers5.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArrayMembers5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionArray/FunctionArraySize.jq b/src/test/resources/test_files/runtime/FunctionArray/FunctionArraySize.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionArray/FunctionArraySize.jq
rename to src/test/resources/test_files/runtime/FunctionArray/FunctionArraySize.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64Binary.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64Binary.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError1.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError1.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError2.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError2.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError3.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError3.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError4.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError4.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError5.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError5.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionBase64BinaryError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinary.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinary.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinary.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError1.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError1.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError2.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError2.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError3.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError3.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FunctionHexBinaryError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBinaries/FuntionHexBinaryError4.jq b/src/test/resources/test_files/runtime/FunctionBinaries/FuntionHexBinaryError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBinaries/FuntionHexBinaryError4.jq
rename to src/test/resources/test_files/runtime/FunctionBinaries/FuntionHexBinaryError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBoolean1.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBoolean1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBoolean1.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBoolean1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBoolean2.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBoolean2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBoolean2.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBoolean2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBoolean3.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBoolean3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBoolean3.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBoolean3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError1.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError1.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError2.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError2.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError3.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError3.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError4.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError4.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError5.jq b/src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError5.jq
rename to src/test/resources/test_files/runtime/FunctionBooleans/FunctionBooleanError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionCall-UndefinedFunctionError1.jq b/src/test/resources/test_files/runtime/FunctionCall-UndefinedFunctionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionCall-UndefinedFunctionError1.jq
rename to src/test/resources/test_files/runtime/FunctionCall-UndefinedFunctionError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionCall-UndefinedFunctionError2.jq b/src/test/resources/test_files/runtime/FunctionCall-UndefinedFunctionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionCall-UndefinedFunctionError2.jq
rename to src/test/resources/test_files/runtime/FunctionCall-UndefinedFunctionError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionCall-UndefinedFunctionError3.jq b/src/test/resources/test_files/runtime/FunctionCall-UndefinedFunctionError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionCall-UndefinedFunctionError3.jq
rename to src/test/resources/test_files/runtime/FunctionCall-UndefinedFunctionError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezone.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezone.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezone.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezone.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError1.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError1.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError2.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError2.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/AdjustDateTimesToTimezoneError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTime.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTime.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError1.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError2.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError3.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError3.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/ExtractingFieldsFromDateTimeError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTime.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTime.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError1.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError2.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionCurrentDateTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTime.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTime.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError1.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError2.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError3.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError3.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError4.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError4.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError5.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError5.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError6.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError6.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionDateTimeError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTime.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTime.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError1.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError2.jq b/src/test/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionDateTimes/FunctionFormatDateTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionCurrentDate.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionCurrentDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionCurrentDate.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionCurrentDate.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError1.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError1.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError2.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError2.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionCurrentDateError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDate.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDate.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDate.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDateError1.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDateError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDateError1.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDateError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDateError2.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDateError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDateError2.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDateError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDateError3.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDateError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDateError3.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDateError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDateError4.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDateError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDateError4.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDateError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDateError5.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDateError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDateError5.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDateError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionDateError6.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionDateError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionDateError6.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionDateError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionFormatDate.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionFormatDate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionFormatDate.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionFormatDate.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionFormatDateError1.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionFormatDateError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionFormatDateError1.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionFormatDateError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDates/FunctionFormatDateError2.jq b/src/test/resources/test_files/runtime/FunctionDates/FunctionFormatDateError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDates/FunctionFormatDateError2.jq
rename to src/test/resources/test_files/runtime/FunctionDates/FunctionFormatDateError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError1.jq b/src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError1.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError2.jq b/src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError2.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError3.jq b/src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError3.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurationError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurations.jq b/src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurations.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/ExtractingFieldsFromDurations.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDuration.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDuration.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDuration.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDuration.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError1.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError1.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError2.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError2.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError3.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError3.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError4.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError4.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError5.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError5.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDayTimeDurationError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDuration.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDuration.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDuration.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDuration.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError1.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError1.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError10.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError10.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError11.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError11.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError12.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError12.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError2.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError2.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError3.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError3.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError4.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError4.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError5.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError5.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError6.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError6.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError7.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError7.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError8.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError8.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError9.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionDurationError9.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionDurationError9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDuration.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDuration.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDuration.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDuration.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError1.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError1.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError2.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError2.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError3.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError3.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError4.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError4.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError5.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError5.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError6.jq b/src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError6.jq
rename to src/test/resources/test_files/runtime/FunctionDurations/FunctionYearMonthDurationError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp10.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp10.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionExp10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog10.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog10.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionLog10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPow1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPow1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPow1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPow1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPowError1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPowError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPowError1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionPowError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionSqrt.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionSqrt.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionSqrt.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Exponential/FunctionSqrt.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionAbs.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionAbs.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionAbs.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionAbs.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionCeiling.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionCeiling.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionCeiling.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionCeiling.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionFloor.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionFloor.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionFloor.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionFloor.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionPi.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionPi.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionPi.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionPi.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionRound1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionRound1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionRound1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionRound1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionRoundError1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionRoundError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionRoundError1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionRoundError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEven1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEven1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEven1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEven1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEvenError1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEvenError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEvenError1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/FunctionRoundHalfToEvenError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctions.jq b/src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctions.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctions.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctions.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError2.jq b/src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError2.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError3.jq b/src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError3.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError4.jq b/src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError4.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError5.jq b/src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError5.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/NumericFunctionsError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionACos.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionACos.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionACos.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionACos.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionASin.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionASin.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionASin.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionASin.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan2.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan2.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATan2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError2.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError2.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionATanError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCos.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCos.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCos.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCos.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError1.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError1.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError2.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError2.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosArityError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosTypeError.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosTypeError.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosTypeError.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionCosTypeError.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionSin.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionSin.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionSin.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionSin.jq
diff --git a/src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionTan.jq b/src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionTan.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionTan.jq
rename to src/test/resources/test_files/runtime/FunctionNumerics/Trigonometric/FunctionTan.jq
diff --git a/src/test/resources/test_files/runtime/FunctionObject/FunctionJsonDoc.jq.deactivated b/src/test/resources/test_files/runtime/FunctionObject/FunctionJsonDoc.jq.deactivated
new file mode 100644
index 0000000000..5084805d2c
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionObject/FunctionJsonDoc.jq.deactivated
@@ -0,0 +1,2 @@
+(:JIQS: ShouldRun; Output="test1" :)
+json-doc("./src/test/resources/test_data/SpreadOverMultipleLinesDocument.json").foobar[[1]]
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionJsonDocError1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionJsonDocError1.jq
similarity index 51%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionJsonDocError1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionJsonDocError1.jq
index a0c6e53fca..54b0143fcd 100644
--- a/src/main/resources/test_files/runtime/FunctionObject/FunctionJsonDocError1.jq
+++ b/src/test/resources/test_files/runtime/FunctionObject/FunctionJsonDocError1.jq
@@ -1,2 +1,2 @@
 (:JIQS: ShouldCrash; ErrorCode="FODC0002"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-json-doc("./src/main/resources/queries/doesnotexist.json").foobar[[1]]
+json-doc("./src/test/resources/test_data/doesnotexist.json").foobar[[1]]
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate4.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate4.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate5.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate5.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate6.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate6.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate7.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate7.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectAccumulate7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant4.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant4.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant5.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant5.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendant5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendantPairs b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendantPairs
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectDescendantPairs
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectDescendantPairs
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect4.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect4.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect5.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect5.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect6.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect6.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectIntersect6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectKeys1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectKeys1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectKeys1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectKeys1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectKeys2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectKeys2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectKeys2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectKeys2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject4.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject4.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject5.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProject5.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProject5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProjectError1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProjectError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectProjectError1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectProjectError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys4.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys4.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys5.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys5.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeys5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError4.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError4.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError5.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError5.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectRemoveKeysError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectValues1.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectValues1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectValues1.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectValues1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectValues2.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectValues2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectValues2.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectValues2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionObject/FunctionObjectValues3.jq b/src/test/resources/test_files/runtime/FunctionObject/FunctionObjectValues3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionObject/FunctionObjectValues3.jq
rename to src/test/resources/test_files/runtime/FunctionObject/FunctionObjectValues3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error1.jq b/src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error1.jq
rename to src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error2.jq b/src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error2.jq
rename to src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication-Error2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication1.jq b/src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication1.jq
rename to src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication2.jq b/src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication2.jq
rename to src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication3.jq b/src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication3.jq
rename to src/test/resources/test_files/runtime/FunctionPartialApplication/PartialFunctionApplication3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverage1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverage1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverage1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverage1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError7.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateAverageError7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMax1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMax1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMax1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMax1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError7.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxError7.jq
diff --git a/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD1.jq
new file mode 100644
index 0000000000..b2f1a94a4e
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD1.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="2013-08-20" :)
+
+max(for $o in json-file("./src/test/resources/test_data/conf-ex.json") return $o.date)
diff --git a/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD2.jq
new file mode 100644
index 0000000000..b27ede334a
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMaxRDD2.jq
@@ -0,0 +1,6 @@
+(:JIQS: ShouldRun; Output="" :)
+
+max(for $o in json-file("./src/test/resources/test_data/confusion_sample_empty.json") return $o.date)
+
+(: empty file :)
+
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMin1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMin1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMin1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMin1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError7.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinError7.jq
diff --git a/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD1.jq
new file mode 100644
index 0000000000..a7105debda
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD1.jq
@@ -0,0 +1,3 @@
+(:JIQS: ShouldRun; Output="2013-08-20" :)
+
+min(for $o in json-file("./src/test/resources/test_data/conf-ex.json") return $o.date)
diff --git a/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD2.jq
new file mode 100644
index 0000000000..3bbb712881
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateMinRDD2.jq
@@ -0,0 +1,6 @@
+(:JIQS: ShouldRun; Output="" :)
+
+min(for $o in json-file("./src/test/resources/test_data/confusion_sample_empty.json") return $o.date)
+
+(: empty file :)
+
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSum2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError7.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError8.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError9.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/AggregateSumError9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionAggregate.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionAggregate.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionAggregate.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionAggregate.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionCount.jq b/src/test/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionCount.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionCount.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Aggregate/FunctionCount.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOne1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOne1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOne1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOne1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDD1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDD1.jq
similarity index 56%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDD1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDD1.jq
index a61dbec36c..02a10843b3 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDD1.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDD1.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldRun; Output="{ "foo" : 1, "bar" : null, "foobar" : [ "test1", "test2" ] }" :)
-exactly-one(json-file("./src/main/resources/queries/singleLine.json"))
+exactly-one(json-file("./src/test/resources/test_data/singleLine.json"))
 
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError1.jq
similarity index 52%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError1.jq
index a5c306dac0..06dd1622e3 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError1.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError1.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldCrash; ErrorCode="FORG0005"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-exactly-one(json-file("./src/main/resources/queries/emptyFile.txt"))
+exactly-one(json-file("./src/test/resources/test_data/emptyFile.txt"))
 
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError2.jq
similarity index 52%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError2.jq
index 291ed262dc..a55a31b734 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError2.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionExactlyOneRDDError2.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldCrash; ErrorCode="FORG0005"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-exactly-one(json-file("./src/main/resources/queries/multiLine.json"))
+exactly-one(json-file("./src/test/resources/test_data/multiLine.json"))
 
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMore1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMore1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMore1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMore1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD1.jq
similarity index 60%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD1.jq
index 10ad8f63ea..9f0c21cd34 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD1.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD1.jq
@@ -1,4 +1,4 @@
 (:JIQS: ShouldRun; Output="({ "foo" : 1, "bar" : null, "foobar" : [ "test1", "test2" ] }, { "foo" : 1, "bar" : null, "foobar" : [ "test1", "test2" ] }, { "foo" : 2, "bar" : "test3", "foobar" : [ "test4", "test5" ] })" :)
-one-or-more(json-file("./src/main/resources/queries/singleLine.json")),
-one-or-more(json-file("./src/main/resources/queries/multiLine.json"))
+one-or-more(json-file("./src/test/resources/test_data/singleLine.json")),
+one-or-more(json-file("./src/test/resources/test_data/multiLine.json"))
 
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD2.jq
similarity index 67%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD2.jq
index cf6942f088..3495e1e024 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD2.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDD2.jq
@@ -1,2 +1,2 @@
 (:JIQS: ShouldRun; Output="{ "LatD" : "41", "LatM" : "5", "LatS" : "59", "NS" : "N", "LonD" : "80", "LonM" : "39", "LonS" : "0", "EW" : "W", "City" : "Youngstown", "State" : "OH" }" :)
-one-or-more(csv-file("./src/main/resources/queries/cities-ex.csv", {"header": true}))
+one-or-more(csv-file("./src/test/resources/test_data/cities-ex.csv", {"header": true}))
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDDError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDDError1.jq
similarity index 52%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDDError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDDError1.jq
index 6420df46a5..aac7517e5c 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDDError1.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionOneOrMoreRDDError1.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldCrash; ErrorCode="FORG0004"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-one-or-more(json-file("./src/main/resources/queries/emptyFile.txt"))
+one-or-more(json-file("./src/test/resources/test_data/emptyFile.txt"))
 
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOne1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOne1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOne1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOne1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneError1.jq
diff --git a/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDD1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDD1.jq
new file mode 100644
index 0000000000..f48dcd5748
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDD1.jq
@@ -0,0 +1,4 @@
+(:JIQS: ShouldRun; Output="{ "foo" : 1, "bar" : null, "foobar" : [ "test1", "test2" ] }" :)
+zero-or-one(json-file("./src/test/resources/test_data/emptyFile.txt")),
+zero-or-one(json-file("./src/test/resources/test_data/singleLine.json"))
+
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDDError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDDError1.jq
similarity index 52%
rename from src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDDError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDDError1.jq
index 026bced012..3b8120a279 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDDError1.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Cardinality/FunctionZeroOrOneRDDError1.jq
@@ -1,3 +1,3 @@
 (:JIQS: ShouldCrash; ErrorCode="FORG0003"; ErrorMetadata="LINE:2:COLUMN:0:" :)
-zero-or-one(json-file("./src/main/resources/queries/multiLine.json"))
+zero-or-one(json-file("./src/test/resources/test_data/multiLine.json"))
 
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/EmptySequence.jq b/src/test/resources/test_files/runtime/FunctionSequence/EmptySequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/EmptySequence.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/EmptySequence.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionEmpty1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionEmpty1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionEmpty1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionEmpty1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionExists1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionExists1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionExists1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionExists1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionHead1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionHead1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionHead1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionHead1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore10.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore10.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore11.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore11.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore12.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore12.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore13.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore13.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore13.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore14.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore14.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore14.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore15.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore15.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore15.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore16.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore16.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore16.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore16.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore17.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore17.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore17.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore17.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore18.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore18.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore18.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore18.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore19.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore19.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore19.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore19.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore20.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore20.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore20.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore20.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore21.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore21.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore21.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore21.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore22.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore22.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore22.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore22.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore23.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore23.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore23.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore23.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore3.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore4.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore5.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore6.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore7.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore8.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore9.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBefore9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionInsertBeforeError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove10.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove10.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove11.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove11.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove12.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove12.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove13.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove13.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove13.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove3.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove4.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove5.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove6.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove7.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove8.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove9.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemove9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemove9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionRemoveError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionReverse1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionReverse1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionReverse1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionReverse1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionReverse2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionReverse2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionReverse2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionReverse2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence10.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence10.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence11.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence11.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence12.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence12.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence13.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence13.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence13.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence14.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence14.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence14.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence15.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence15.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence15.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence16.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence16.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence16.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence16.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence17.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence17.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence17.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence17.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence18.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence18.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence18.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence18.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence19.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence19.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence19.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence19.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence20.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence20.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence20.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence20.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence21.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence21.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence21.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence21.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence22.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence22.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence22.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence22.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence23.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence23.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence23.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence23.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence24.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence24.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence24.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence24.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence3.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence4.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence5.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence6.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence7.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence8.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence9.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequence9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError10.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError10.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError3.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError4.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError5.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError6.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError7.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError8.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError9.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionSubsequenceError9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionTail1.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionTail1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionTail1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionTail1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/General/FunctionTail2.jq b/src/test/resources/test_files/runtime/FunctionSequence/General/FunctionTail2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/General/FunctionTail2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/General/FunctionTail2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionDistinctValues2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/ErrorFunctionIndexOf4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual10.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual10.jq
similarity index 80%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual10.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual10.jq
index 80cdd64c4c..87fdf30ce2 100644
--- a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual10.jq
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual10.jq
@@ -6,6 +6,6 @@ deep-equal(parallelize(()), parallelize((1, 2))),
 deep-equal(parallelize((1, 2)), parallelize(())),
 deep-equal(parallelize((1, 1, 1, 1, 1)), parallelize((1, 1, 1, 1, 1))),
 deep-equal(parallelize((5, 4, 3, 2, 1)), parallelize((1, 2, 3, 4, 5))),
-deep-equal(csv-file("./src/main/resources/queries/cities.csv"), csv-file("./src/main/resources/queries/cities.csv"))
+deep-equal(csv-file("./src/test/resources/test_data/cities.csv"), csv-file("./src/test/resources/test_data/cities.csv"))
 
 (: general parallelized inputs :)
diff --git a/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual11.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual11.jq
new file mode 100644
index 0000000000..897c893ca4
--- /dev/null
+++ b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual11.jq
@@ -0,0 +1,9 @@
+(:JIQS: ShouldRun; Output="(false, false, true, true, false, true)" :)
+deep-equal(csv-file("./src/test/resources/test_data/cities.csv"), json-file("./src/test/resources/test_data/conf-ex.json", 10)),
+deep-equal(json-file("./src/test/resources/test_data/conf-ex.json", 10), csv-file("./src/test/resources/test_data/cities.csv")),
+deep-equal(json-file("./src/test/resources/test_data/conf-ex.json", 4), json-file("./src/test/resources/test_data/conf-ex.json", 5)),
+deep-equal(json-file("./src/test/resources/test_data/conf-ex.json", 5), json-file("./src/test/resources/test_data/conf-ex.json", 4)),
+deep-equal(parallelize((1, 2, 3, 4, 5), 2), parallelize((1, 2, 3, 4, 5, 6), 2)),
+deep-equal(parallelize(1 to 10000, 2), parallelize(1 to 10000, 20))
+
+(: parallelized inputs with varying partition sizes :)
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual5.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual6.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual7.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual8.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual9.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDeepEqual9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionDistinctValues2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf1.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf1.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf10.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf10.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf11.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf11.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf12.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf12.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf2.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf2.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf3.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf3.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf4.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf4.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf5.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf5.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf6.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf6.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf7.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf7.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf8.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf8.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf9.jq b/src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf9.jq
rename to src/test/resources/test_files/runtime/FunctionSequence/Value/FunctionIndexOf9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointEqual1.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointEqual1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointEqual1.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointEqual1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointEqual2.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointEqual2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointEqual2.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointEqual2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointsToString1.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointsToString1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointsToString1.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointsToString1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointsToString2.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointsToString2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointsToString2.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointsToString2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointsToStringError1.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointsToStringError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointsToStringError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointsToStringError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointsToStringError2.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointsToStringError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointsToStringError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointsToStringError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/CodepointsToStringError3.jq b/src/test/resources/test_files/runtime/FunctionString/CodepointsToStringError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/CodepointsToStringError3.jq
rename to src/test/resources/test_files/runtime/FunctionString/CodepointsToStringError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ConcatFunction1.jq b/src/test/resources/test_files/runtime/FunctionString/ConcatFunction1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ConcatFunction1.jq
rename to src/test/resources/test_files/runtime/FunctionString/ConcatFunction1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ConcatFunction2.jq b/src/test/resources/test_files/runtime/FunctionString/ConcatFunction2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ConcatFunction2.jq
rename to src/test/resources/test_files/runtime/FunctionString/ConcatFunction2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ConcatFunctionError1.jq b/src/test/resources/test_files/runtime/FunctionString/ConcatFunctionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ConcatFunctionError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/ConcatFunctionError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ConcatFunctionError2.jq b/src/test/resources/test_files/runtime/FunctionString/ConcatFunctionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ConcatFunctionError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/ConcatFunctionError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ConcatFunctionError3.jq b/src/test/resources/test_files/runtime/FunctionString/ConcatFunctionError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ConcatFunctionError3.jq
rename to src/test/resources/test_files/runtime/FunctionString/ConcatFunctionError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Contains.jq b/src/test/resources/test_files/runtime/FunctionString/Contains.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Contains.jq
rename to src/test/resources/test_files/runtime/FunctionString/Contains.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/EndsWith.jq b/src/test/resources/test_files/runtime/FunctionString/EndsWith.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/EndsWith.jq
rename to src/test/resources/test_files/runtime/FunctionString/EndsWith.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/LowerCase1.jq b/src/test/resources/test_files/runtime/FunctionString/LowerCase1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/LowerCase1.jq
rename to src/test/resources/test_files/runtime/FunctionString/LowerCase1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/LowerCase2.jq b/src/test/resources/test_files/runtime/FunctionString/LowerCase2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/LowerCase2.jq
rename to src/test/resources/test_files/runtime/FunctionString/LowerCase2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Matches.jq b/src/test/resources/test_files/runtime/FunctionString/Matches.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Matches.jq
rename to src/test/resources/test_files/runtime/FunctionString/Matches.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/NormalizeSpace.jq b/src/test/resources/test_files/runtime/FunctionString/NormalizeSpace.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/NormalizeSpace.jq
rename to src/test/resources/test_files/runtime/FunctionString/NormalizeSpace.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Replace1.jq b/src/test/resources/test_files/runtime/FunctionString/Replace1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Replace1.jq
rename to src/test/resources/test_files/runtime/FunctionString/Replace1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Replace2.jq b/src/test/resources/test_files/runtime/FunctionString/Replace2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Replace2.jq
rename to src/test/resources/test_files/runtime/FunctionString/Replace2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ReplaceError1.jq b/src/test/resources/test_files/runtime/FunctionString/ReplaceError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ReplaceError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/ReplaceError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ReplaceError2.jq b/src/test/resources/test_files/runtime/FunctionString/ReplaceError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ReplaceError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/ReplaceError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ReplaceError3.jq b/src/test/resources/test_files/runtime/FunctionString/ReplaceError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ReplaceError3.jq
rename to src/test/resources/test_files/runtime/FunctionString/ReplaceError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/ReplaceError4.jq b/src/test/resources/test_files/runtime/FunctionString/ReplaceError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/ReplaceError4.jq
rename to src/test/resources/test_files/runtime/FunctionString/ReplaceError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SerializeFunction1.jq b/src/test/resources/test_files/runtime/FunctionString/SerializeFunction1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SerializeFunction1.jq
rename to src/test/resources/test_files/runtime/FunctionString/SerializeFunction1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SerializeFunction2.jq b/src/test/resources/test_files/runtime/FunctionString/SerializeFunction2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SerializeFunction2.jq
rename to src/test/resources/test_files/runtime/FunctionString/SerializeFunction2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SerializeFunction3.jq b/src/test/resources/test_files/runtime/FunctionString/SerializeFunction3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SerializeFunction3.jq
rename to src/test/resources/test_files/runtime/FunctionString/SerializeFunction3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SerializeFunction4.jq b/src/test/resources/test_files/runtime/FunctionString/SerializeFunction4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SerializeFunction4.jq
rename to src/test/resources/test_files/runtime/FunctionString/SerializeFunction4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SerializeFunctionError1.jq b/src/test/resources/test_files/runtime/FunctionString/SerializeFunctionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SerializeFunctionError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/SerializeFunctionError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SerializeFunctionError2.jq b/src/test/resources/test_files/runtime/FunctionString/SerializeFunctionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SerializeFunctionError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/SerializeFunctionError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StartsWith1.jq b/src/test/resources/test_files/runtime/FunctionString/StartsWith1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StartsWith1.jq
rename to src/test/resources/test_files/runtime/FunctionString/StartsWith1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringFunctionError1.jq b/src/test/resources/test_files/runtime/FunctionString/StringFunctionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringFunctionError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringFunctionError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringFunctionError2.jq b/src/test/resources/test_files/runtime/FunctionString/StringFunctionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringFunctionError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringFunctionError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringFunctionError3.jq b/src/test/resources/test_files/runtime/FunctionString/StringFunctionError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringFunctionError3.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringFunctionError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoin1.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoin1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoin1.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoin1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoin2.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoin2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoin2.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoin2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError1.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError2.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError3.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError3.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError4.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError4.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError5.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError5.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError6.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError6.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError7.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError7.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringJoinError8.jq b/src/test/resources/test_files/runtime/FunctionString/StringJoinError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringJoinError8.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringJoinError8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringLength.jq b/src/test/resources/test_files/runtime/FunctionString/StringLength.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringLength.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringLength.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringLengthError1.jq b/src/test/resources/test_files/runtime/FunctionString/StringLengthError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringLengthError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringLengthError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringLengthError2.jq b/src/test/resources/test_files/runtime/FunctionString/StringLengthError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringLengthError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringLengthError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringToCodepoints1.jq b/src/test/resources/test_files/runtime/FunctionString/StringToCodepoints1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringToCodepoints1.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringToCodepoints1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/StringToCodepoints2.jq b/src/test/resources/test_files/runtime/FunctionString/StringToCodepoints2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/StringToCodepoints2.jq
rename to src/test/resources/test_files/runtime/FunctionString/StringToCodepoints2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Substring1.jq b/src/test/resources/test_files/runtime/FunctionString/Substring1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Substring1.jq
rename to src/test/resources/test_files/runtime/FunctionString/Substring1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Substring2.jq b/src/test/resources/test_files/runtime/FunctionString/Substring2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Substring2.jq
rename to src/test/resources/test_files/runtime/FunctionString/Substring2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringAfter.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringAfter.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringAfter.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringAfter.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringBefore.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringBefore.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringBefore.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringBefore.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError1.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError1.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError10.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError10.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError11.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError11.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError12.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError12.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError13.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError13.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError13.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError14.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError14.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError14.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError15.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError15.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError15.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError16.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError16.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError16.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError16.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError2.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError2.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError20.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError20.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError20.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError20.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError3.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError3.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError4.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError4.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError5.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError5.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError6.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError6.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError7.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError7.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError8.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError8.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/SubstringError9.jq b/src/test/resources/test_files/runtime/FunctionString/SubstringError9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/SubstringError9.jq
rename to src/test/resources/test_files/runtime/FunctionString/SubstringError9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Translate1.jq b/src/test/resources/test_files/runtime/FunctionString/Translate1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Translate1.jq
rename to src/test/resources/test_files/runtime/FunctionString/Translate1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/Translate2.jq b/src/test/resources/test_files/runtime/FunctionString/Translate2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/Translate2.jq
rename to src/test/resources/test_files/runtime/FunctionString/Translate2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/UpperCase1.jq b/src/test/resources/test_files/runtime/FunctionString/UpperCase1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/UpperCase1.jq
rename to src/test/resources/test_files/runtime/FunctionString/UpperCase1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/UpperCase2.jq b/src/test/resources/test_files/runtime/FunctionString/UpperCase2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/UpperCase2.jq
rename to src/test/resources/test_files/runtime/FunctionString/UpperCase2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionString/stringFunction.jq b/src/test/resources/test_files/runtime/FunctionString/stringFunction.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionString/stringFunction.jq
rename to src/test/resources/test_files/runtime/FunctionString/stringFunction.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionCurrentTime.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionCurrentTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionCurrentTime.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionCurrentTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError1.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError2.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionCurrentTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionFormatTime.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionFormatTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionFormatTime.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionFormatTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError1.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError2.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionFormatTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionTime.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionTime.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionTime.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionTime.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError1.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError1.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError2.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError2.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError3.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError3.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError4.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError4.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError5.jq b/src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionTimes/FunctionTimeError5.jq
rename to src/test/resources/test_files/runtime/FunctionTimes/FunctionTimeError5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/DynamicFunctionCall-Error2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure-Error2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure-Error2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure-Error2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionClosure3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error4.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error4.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error5.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error5.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error6.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error6.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error7.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error7.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition-Error7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition4.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition4.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/InlineFunctionDefinition4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error10.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error10.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error11.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error11.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error12.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error12.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error13.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error13.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error13.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error14.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error14.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error14.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error15.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error15.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error15.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error16.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error16.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error16.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error16.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error4.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error4.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error5.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error5.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error6.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error6.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error7.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error7.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error8.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error8.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error9.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error9.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef-Error9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedDynamic/NamedFunctionRef3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable2.jq.disabled b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable2.jq.disabled
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable2.jq.disabled
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariable2.jq.disabled
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariableError1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariableError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariableError1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionConsumingVariableError1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error4.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error4.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error5.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error5.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error6.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error6.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error7.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error7.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic-Error7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic10.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic10.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic10.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic11.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic11.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic11.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic12.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic12.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic12.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic13.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic13.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic13.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic3.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic4.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic4.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic4.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic5.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic5.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic5.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic6.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic6.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic6.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic7.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic7.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic7.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic8.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic8.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic8.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic9.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic9.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/FunctionUserDefinedStatic9.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion1.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion1.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion1.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion2.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion2.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion2.jq
diff --git a/src/main/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion3.jq b/src/test/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion3.jq
rename to src/test/resources/test_files/runtime/FunctionUserDefinedStatic/Recursion3.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOf.jq b/src/test/resources/test_files/runtime/InstanceOf.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOf.jq
rename to src/test/resources/test_files/runtime/InstanceOf.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOfAnyURI.jq b/src/test/resources/test_files/runtime/InstanceOfAnyURI.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOfAnyURI.jq
rename to src/test/resources/test_files/runtime/InstanceOfAnyURI.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOfBinaries.jq b/src/test/resources/test_files/runtime/InstanceOfBinaries.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOfBinaries.jq
rename to src/test/resources/test_files/runtime/InstanceOfBinaries.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOfDateTimes.jq b/src/test/resources/test_files/runtime/InstanceOfDateTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOfDateTimes.jq
rename to src/test/resources/test_files/runtime/InstanceOfDateTimes.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOfDurations.jq b/src/test/resources/test_files/runtime/InstanceOfDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOfDurations.jq
rename to src/test/resources/test_files/runtime/InstanceOfDurations.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOfWithEmptySequence.jq b/src/test/resources/test_files/runtime/InstanceOfWithEmptySequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOfWithEmptySequence.jq
rename to src/test/resources/test_files/runtime/InstanceOfWithEmptySequence.jq
diff --git a/src/main/resources/test_files/runtime/InstanceOfWithNull.jq b/src/test/resources/test_files/runtime/InstanceOfWithNull.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/InstanceOfWithNull.jq
rename to src/test/resources/test_files/runtime/InstanceOfWithNull.jq
diff --git a/src/main/resources/test_files/runtime/Jso.jqVersion.jq b/src/test/resources/test_files/runtime/Jso.jqVersion.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Jso.jqVersion.jq
rename to src/test/resources/test_files/runtime/Jso.jqVersion.jq
diff --git a/src/main/resources/test_files/runtime/Keywords1.jq b/src/test/resources/test_files/runtime/Keywords1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Keywords1.jq
rename to src/test/resources/test_files/runtime/Keywords1.jq
diff --git a/src/main/resources/test_files/runtime/Keywords2.jq b/src/test/resources/test_files/runtime/Keywords2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Keywords2.jq
rename to src/test/resources/test_files/runtime/Keywords2.jq
diff --git a/src/main/resources/test_files/runtime/MergingConstructor.jq b/src/test/resources/test_files/runtime/MergingConstructor.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/MergingConstructor.jq
rename to src/test/resources/test_files/runtime/MergingConstructor.jq
diff --git a/src/main/resources/test_files/runtime/NestedFLWORLocal1.jq b/src/test/resources/test_files/runtime/NestedFLWORLocal1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/NestedFLWORLocal1.jq
rename to src/test/resources/test_files/runtime/NestedFLWORLocal1.jq
diff --git a/src/main/resources/test_files/runtime/NestedFLWORLocal2.jq b/src/test/resources/test_files/runtime/NestedFLWORLocal2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/NestedFLWORLocal2.jq
rename to src/test/resources/test_files/runtime/NestedFLWORLocal2.jq
diff --git a/src/main/resources/test_files/runtime/NestedFLWORLocal3.jq b/src/test/resources/test_files/runtime/NestedFLWORLocal3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/NestedFLWORLocal3.jq
rename to src/test/resources/test_files/runtime/NestedFLWORLocal3.jq
diff --git a/src/main/resources/test_files/runtime/NestedFLWORLocal4.jq b/src/test/resources/test_files/runtime/NestedFLWORLocal4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/NestedFLWORLocal4.jq
rename to src/test/resources/test_files/runtime/NestedFLWORLocal4.jq
diff --git a/src/main/resources/test_files/runtime/NestedFLWORLocal5.jq b/src/test/resources/test_files/runtime/NestedFLWORLocal5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/NestedFLWORLocal5.jq
rename to src/test/resources/test_files/runtime/NestedFLWORLocal5.jq
diff --git a/src/main/resources/test_files/runtime/Object.jq b/src/test/resources/test_files/runtime/Object.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Object.jq
rename to src/test/resources/test_files/runtime/Object.jq
diff --git a/src/main/resources/test_files/runtime/ObjectArrayLookup.jq b/src/test/resources/test_files/runtime/ObjectArrayLookup.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ObjectArrayLookup.jq
rename to src/test/resources/test_files/runtime/ObjectArrayLookup.jq
diff --git a/src/main/resources/test_files/runtime/ObjectUnquotedKey1.jq b/src/test/resources/test_files/runtime/ObjectUnquotedKey1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ObjectUnquotedKey1.jq
rename to src/test/resources/test_files/runtime/ObjectUnquotedKey1.jq
diff --git a/src/main/resources/test_files/runtime/ObjectUnquotedKey2.jq b/src/test/resources/test_files/runtime/ObjectUnquotedKey2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/ObjectUnquotedKey2.jq
rename to src/test/resources/test_files/runtime/ObjectUnquotedKey2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOp1.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOp1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOp1.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOp1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOp2.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOp2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOp2.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOp2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOp3.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOp3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOp3.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOp3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOp4.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOp4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOp4.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOp4.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOp5.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOp5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOp5.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOp5.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError1.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError1.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError2.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError2.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError3.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError3.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError4.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError4.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError4.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError5.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError5.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError5.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError6.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError6.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError6.jq
diff --git a/src/main/resources/test_files/runtime/Operational/AdditiveOpError7.jq b/src/test/resources/test_files/runtime/Operational/AdditiveOpError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/AdditiveOpError7.jq
rename to src/test/resources/test_files/runtime/Operational/AdditiveOpError7.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Boolean1.jq b/src/test/resources/test_files/runtime/Operational/Boolean1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Boolean1.jq
rename to src/test/resources/test_files/runtime/Operational/Boolean1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Boolean2.jq b/src/test/resources/test_files/runtime/Operational/Boolean2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Boolean2.jq
rename to src/test/resources/test_files/runtime/Operational/Boolean2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonArrayType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonArrayType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonArrayType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonArrayType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBase64Binary.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBase64Binary.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBooleanType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBooleanType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBooleanType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonBooleanType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonDateType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonDateType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonDateType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonDateType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonHexBinary.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonHexBinary.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonHexBinary.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonNumericType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonNumericType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonNumericType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonNumericType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonObjectType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonObjectType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonObjectType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonObjectType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonStringType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonStringType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonStringType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonStringType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonTimeType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonTimeType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonTimeType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorGeneralComparisonTimeType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonArrayType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonArrayType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonArrayType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonArrayType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBase64Binary.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBase64Binary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBase64Binary.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBase64Binary.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBooleanType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBooleanType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBooleanType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonBooleanType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDateType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDateType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDateType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDateType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDayTimeDurationType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDayTimeDurationType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDayTimeDurationType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDayTimeDurationType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDurationType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDurationType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDurationType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonDurationType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonHexBinary.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonHexBinary.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonHexBinary.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonHexBinary.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonNumericType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonNumericType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonNumericType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonNumericType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonObjectType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonObjectType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonObjectType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonObjectType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonSequenceType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonSequenceType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonSequenceType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonSequenceType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonStringType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonStringType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonStringType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonStringType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonTimeType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonTimeType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonTimeType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonTimeType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonYearMonthDurationType.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonYearMonthDurationType.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonYearMonthDurationType.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ErrorValueComparisonYearMonthDurationType.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBinaries.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBinaries.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBinaries.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBinaries.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBooleans.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBooleans.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBooleans.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonBooleans.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDateTimes.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDateTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDateTimes.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDateTimes.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDates.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDates.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDates.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDates.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDurations.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDurations.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonDurations.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonEmptySequence.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonEmptySequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonEmptySequence.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonEmptySequence.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNull.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNull.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNull.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNull.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNumerics.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNumerics.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNumerics.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonNumerics.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonStrings.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonStrings.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonStrings.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonStrings.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonTimes.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonTimes.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/GeneralComparisonTimes.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBinaries.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBinaries.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBinaries.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBinaries.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBooleans.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBooleans.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBooleans.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonBooleans.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDateTimes.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDateTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDateTimes.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDateTimes.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDates.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDates.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDates.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDates.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDurations.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDurations.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDurations.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonDurations.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonEmptySequence.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonEmptySequence.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonEmptySequence.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonEmptySequence.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNull.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNull.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNull.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNull.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNumerics.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNumerics.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNumerics.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonNumerics.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonStrings.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonStrings.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonStrings.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonStrings.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonTimes.jq b/src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonTimes.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Comparisons/ValueComparisonTimes.jq
rename to src/test/resources/test_files/runtime/Operational/Comparisons/ValueComparisonTimes.jq
diff --git a/src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType1.jq b/src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType1.jq
rename to src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType2.jq b/src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType2.jq
rename to src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType3.jq b/src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType3.jq
rename to src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType4.jq b/src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType4.jq
rename to src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType4.jq
diff --git a/src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType5.jq b/src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/ErrorUnexpectedType5.jq
rename to src/test/resources/test_files/runtime/Operational/ErrorUnexpectedType5.jq
diff --git a/src/main/resources/test_files/runtime/Operational/IntegerArithmeticParenthesized.jq b/src/test/resources/test_files/runtime/Operational/IntegerArithmeticParenthesized.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/IntegerArithmeticParenthesized.jq
rename to src/test/resources/test_files/runtime/Operational/IntegerArithmeticParenthesized.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Logics1.jq b/src/test/resources/test_files/runtime/Operational/Logics1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Logics1.jq
rename to src/test/resources/test_files/runtime/Operational/Logics1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Logics2.jq b/src/test/resources/test_files/runtime/Operational/Logics2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Logics2.jq
rename to src/test/resources/test_files/runtime/Operational/Logics2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/LogicsError1.jq b/src/test/resources/test_files/runtime/Operational/LogicsError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/LogicsError1.jq
rename to src/test/resources/test_files/runtime/Operational/LogicsError1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/LogicsError2.jq b/src/test/resources/test_files/runtime/Operational/LogicsError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/LogicsError2.jq
rename to src/test/resources/test_files/runtime/Operational/LogicsError2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MixedOperationArithmetic1.jq b/src/test/resources/test_files/runtime/Operational/MixedOperationArithmetic1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MixedOperationArithmetic1.jq
rename to src/test/resources/test_files/runtime/Operational/MixedOperationArithmetic1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MixedOperationArithmetic2.jq b/src/test/resources/test_files/runtime/Operational/MixedOperationArithmetic2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MixedOperationArithmetic2.jq
rename to src/test/resources/test_files/runtime/Operational/MixedOperationArithmetic2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MixedOperationsArithmetic9.jq b/src/test/resources/test_files/runtime/Operational/MixedOperationsArithmetic9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MixedOperationsArithmetic9.jq
rename to src/test/resources/test_files/runtime/Operational/MixedOperationsArithmetic9.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp1.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp1.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp2.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp2.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp3.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp3.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp4.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp4.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp4.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp5.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp5.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp5.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp6.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp6.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp6.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp7.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp7.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp7.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOp9.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOp9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOp9.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOp9.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOpError1.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOpError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOpError1.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOpError1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOpError2.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOpError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOpError2.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOpError2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOpError3.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOpError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOpError3.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOpError3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOpError4.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOpError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOpError4.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOpError4.jq
diff --git a/src/main/resources/test_files/runtime/Operational/MultiplicativeOpError5.jq b/src/test/resources/test_files/runtime/Operational/MultiplicativeOpError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/MultiplicativeOpError5.jq
rename to src/test/resources/test_files/runtime/Operational/MultiplicativeOpError5.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Range1.jq b/src/test/resources/test_files/runtime/Operational/Range1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Range1.jq
rename to src/test/resources/test_files/runtime/Operational/Range1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Range2.jq b/src/test/resources/test_files/runtime/Operational/Range2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Range2.jq
rename to src/test/resources/test_files/runtime/Operational/Range2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Range3.jq b/src/test/resources/test_files/runtime/Operational/Range3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Range3.jq
rename to src/test/resources/test_files/runtime/Operational/Range3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/Range4.jq b/src/test/resources/test_files/runtime/Operational/Range4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/Range4.jq
rename to src/test/resources/test_files/runtime/Operational/Range4.jq
diff --git a/src/main/resources/test_files/runtime/Operational/RangeError1.jq b/src/test/resources/test_files/runtime/Operational/RangeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/RangeError1.jq
rename to src/test/resources/test_files/runtime/Operational/RangeError1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/RangeError2.jq b/src/test/resources/test_files/runtime/Operational/RangeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/RangeError2.jq
rename to src/test/resources/test_files/runtime/Operational/RangeError2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/RangeError3.jq b/src/test/resources/test_files/runtime/Operational/RangeError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/RangeError3.jq
rename to src/test/resources/test_files/runtime/Operational/RangeError3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/StringConcat1.jq b/src/test/resources/test_files/runtime/Operational/StringConcat1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/StringConcat1.jq
rename to src/test/resources/test_files/runtime/Operational/StringConcat1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/StringConcat2.jq b/src/test/resources/test_files/runtime/Operational/StringConcat2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/StringConcat2.jq
rename to src/test/resources/test_files/runtime/Operational/StringConcat2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/StringConcatError1.jq b/src/test/resources/test_files/runtime/Operational/StringConcatError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/StringConcatError1.jq
rename to src/test/resources/test_files/runtime/Operational/StringConcatError1.jq
diff --git a/src/main/resources/test_files/runtime/Operational/StringConcatError2.jq b/src/test/resources/test_files/runtime/Operational/StringConcatError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/StringConcatError2.jq
rename to src/test/resources/test_files/runtime/Operational/StringConcatError2.jq
diff --git a/src/main/resources/test_files/runtime/Operational/StringConcatError3.jq b/src/test/resources/test_files/runtime/Operational/StringConcatError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/StringConcatError3.jq
rename to src/test/resources/test_files/runtime/Operational/StringConcatError3.jq
diff --git a/src/main/resources/test_files/runtime/Operational/UnaryOp.jq b/src/test/resources/test_files/runtime/Operational/UnaryOp.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Operational/UnaryOp.jq
rename to src/test/resources/test_files/runtime/Operational/UnaryOp.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup1.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup1.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup2.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup2.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup2.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup3.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup3.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup3.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup4.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup4.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/ErrorPostFixArrayLookup4.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup1.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup1.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup2.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup2.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup2.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup3.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup3.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup3.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup4.jq b/src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup4.jq
rename to src/test/resources/test_files/runtime/PostFixArrayLookup/PostFixArrayLookup4.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing1.jq b/src/test/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing1.jq
rename to src/test/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing2.jq b/src/test/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing2.jq
rename to src/test/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing2.jq
diff --git a/src/main/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing3.jq b/src/test/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing3.jq
rename to src/test/resources/test_files/runtime/PostFixArrayUnboxing/ArrayUnboxing3.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup1.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup1.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup2.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup2.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup2.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup3.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup3.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup3.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup4.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup4.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/ErrorPostFixObjectLookup4.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup1.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup1.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup10.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup10.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup10.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup11.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup11.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup11.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup12.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup12.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup12.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup13.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup13.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup13.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup14.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup14.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup14.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup2.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup2.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup2.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup3.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup3.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup3.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup4.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup4.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup4.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup5.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup5.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup5.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup6.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup6.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup6.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup7.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup7.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup7.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup8.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup8.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup8.jq
diff --git a/src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup9.jq b/src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup9.jq
rename to src/test/resources/test_files/runtime/PostFixObjectLookup/PostFixObjectLookup9.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate1.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate1.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate2.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate2.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate2.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate3.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate3.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate3.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate4.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate4.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate4.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate5.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate5.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate5.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate6.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate6.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate6.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate7.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate7.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate7.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate8.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicate8.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicate8.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError1.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError1.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError1.jq
diff --git a/src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError2.jq b/src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError2.jq
rename to src/test/resources/test_files/runtime/PostFixPredicate/PostFixPredicateError2.jq
diff --git a/src/main/resources/test_files/runtime/PrimaryIterators/ObjectConstructor1.jq b/src/test/resources/test_files/runtime/PrimaryIterators/ObjectConstructor1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PrimaryIterators/ObjectConstructor1.jq
rename to src/test/resources/test_files/runtime/PrimaryIterators/ObjectConstructor1.jq
diff --git a/src/main/resources/test_files/runtime/PrimaryIterators/ObjectConstructor2.jq b/src/test/resources/test_files/runtime/PrimaryIterators/ObjectConstructor2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PrimaryIterators/ObjectConstructor2.jq
rename to src/test/resources/test_files/runtime/PrimaryIterators/ObjectConstructor2.jq
diff --git a/src/main/resources/test_files/runtime/PrologDependencies1.jq b/src/test/resources/test_files/runtime/PrologDependencies1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PrologDependencies1.jq
rename to src/test/resources/test_files/runtime/PrologDependencies1.jq
diff --git a/src/main/resources/test_files/runtime/PrologDependencies2.jq b/src/test/resources/test_files/runtime/PrologDependencies2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PrologDependencies2.jq
rename to src/test/resources/test_files/runtime/PrologDependencies2.jq
diff --git a/src/main/resources/test_files/runtime/PrologDependenciesError1.jq b/src/test/resources/test_files/runtime/PrologDependenciesError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/PrologDependenciesError1.jq
rename to src/test/resources/test_files/runtime/PrologDependenciesError1.jq
diff --git a/src/main/resources/test_files/runtime/QuantifiedExpr.jq b/src/test/resources/test_files/runtime/QuantifiedExpr.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/QuantifiedExpr.jq
rename to src/test/resources/test_files/runtime/QuantifiedExpr.jq
diff --git a/src/main/resources/test_files/runtime/QuoteEscaping.jq b/src/test/resources/test_files/runtime/QuoteEscaping.jq
similarity index 55%
rename from src/main/resources/test_files/runtime/QuoteEscaping.jq
rename to src/test/resources/test_files/runtime/QuoteEscaping.jq
index 314f627cca..529fa4a34d 100644
--- a/src/main/resources/test_files/runtime/QuoteEscaping.jq
+++ b/src/test/resources/test_files/runtime/QuoteEscaping.jq
@@ -1,2 +1,2 @@
 (:JIQS: ShouldRun; Output="{ "foo\"foo\\nbar" : "foo\"foo\\nbar" }" :)
-json-file("./src/main/resources/queries/quotes.json")
+json-file("./src/test/resources/test_data/quotes.json")
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression1.jq b/src/test/resources/test_files/runtime/SimpleMapExpression1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression1.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression1.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression10.jq b/src/test/resources/test_files/runtime/SimpleMapExpression10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression10.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression10.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression11.jq b/src/test/resources/test_files/runtime/SimpleMapExpression11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression11.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression11.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression12.jq b/src/test/resources/test_files/runtime/SimpleMapExpression12.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression12.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression12.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression13.jq b/src/test/resources/test_files/runtime/SimpleMapExpression13.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression13.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression13.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression14.jq b/src/test/resources/test_files/runtime/SimpleMapExpression14.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression14.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression14.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression15.jq b/src/test/resources/test_files/runtime/SimpleMapExpression15.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression15.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression15.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression16.jq b/src/test/resources/test_files/runtime/SimpleMapExpression16.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression16.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression16.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression17.jq b/src/test/resources/test_files/runtime/SimpleMapExpression17.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression17.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression17.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression18.jq b/src/test/resources/test_files/runtime/SimpleMapExpression18.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression18.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression18.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression19.jq b/src/test/resources/test_files/runtime/SimpleMapExpression19.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression19.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression19.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression2.jq b/src/test/resources/test_files/runtime/SimpleMapExpression2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression2.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression2.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression20.jq b/src/test/resources/test_files/runtime/SimpleMapExpression20.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression20.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression20.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression3.jq b/src/test/resources/test_files/runtime/SimpleMapExpression3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression3.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression3.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression4.jq b/src/test/resources/test_files/runtime/SimpleMapExpression4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression4.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression4.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression5.jq b/src/test/resources/test_files/runtime/SimpleMapExpression5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression5.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression5.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression6.jq b/src/test/resources/test_files/runtime/SimpleMapExpression6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression6.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression6.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression7.jq b/src/test/resources/test_files/runtime/SimpleMapExpression7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression7.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression7.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression8.jq b/src/test/resources/test_files/runtime/SimpleMapExpression8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression8.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression8.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpression9.jq b/src/test/resources/test_files/runtime/SimpleMapExpression9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpression9.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpression9.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpressionError1.jq b/src/test/resources/test_files/runtime/SimpleMapExpressionError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpressionError1.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpressionError1.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpressionError2.jq b/src/test/resources/test_files/runtime/SimpleMapExpressionError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpressionError2.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpressionError2.jq
diff --git a/src/main/resources/test_files/runtime/SimpleMapExpressionError3.jq b/src/test/resources/test_files/runtime/SimpleMapExpressionError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/SimpleMapExpressionError3.jq
rename to src/test/resources/test_files/runtime/SimpleMapExpressionError3.jq
diff --git a/src/main/resources/test_files/runtime/Tokenize.jq b/src/test/resources/test_files/runtime/Tokenize.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Tokenize.jq
rename to src/test/resources/test_files/runtime/Tokenize.jq
diff --git a/src/main/resources/test_files/runtime/Tokenize2.jq b/src/test/resources/test_files/runtime/Tokenize2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Tokenize2.jq
rename to src/test/resources/test_files/runtime/Tokenize2.jq
diff --git a/src/main/resources/test_files/runtime/Tokenize3.jq b/src/test/resources/test_files/runtime/Tokenize3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Tokenize3.jq
rename to src/test/resources/test_files/runtime/Tokenize3.jq
diff --git a/src/main/resources/test_files/runtime/Treat.jq b/src/test/resources/test_files/runtime/Treat.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/Treat.jq
rename to src/test/resources/test_files/runtime/Treat.jq
diff --git a/src/main/resources/test_files/runtime/TreatError1.jq b/src/test/resources/test_files/runtime/TreatError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError1.jq
rename to src/test/resources/test_files/runtime/TreatError1.jq
diff --git a/src/main/resources/test_files/runtime/TreatError10.jq b/src/test/resources/test_files/runtime/TreatError10.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError10.jq
rename to src/test/resources/test_files/runtime/TreatError10.jq
diff --git a/src/main/resources/test_files/runtime/TreatError11.jq b/src/test/resources/test_files/runtime/TreatError11.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError11.jq
rename to src/test/resources/test_files/runtime/TreatError11.jq
diff --git a/src/main/resources/test_files/runtime/TreatError2.jq b/src/test/resources/test_files/runtime/TreatError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError2.jq
rename to src/test/resources/test_files/runtime/TreatError2.jq
diff --git a/src/main/resources/test_files/runtime/TreatError3.jq b/src/test/resources/test_files/runtime/TreatError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError3.jq
rename to src/test/resources/test_files/runtime/TreatError3.jq
diff --git a/src/main/resources/test_files/runtime/TreatError4.jq b/src/test/resources/test_files/runtime/TreatError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError4.jq
rename to src/test/resources/test_files/runtime/TreatError4.jq
diff --git a/src/main/resources/test_files/runtime/TreatError5.jq b/src/test/resources/test_files/runtime/TreatError5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError5.jq
rename to src/test/resources/test_files/runtime/TreatError5.jq
diff --git a/src/main/resources/test_files/runtime/TreatError6.jq b/src/test/resources/test_files/runtime/TreatError6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError6.jq
rename to src/test/resources/test_files/runtime/TreatError6.jq
diff --git a/src/main/resources/test_files/runtime/TreatError7.jq b/src/test/resources/test_files/runtime/TreatError7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError7.jq
rename to src/test/resources/test_files/runtime/TreatError7.jq
diff --git a/src/main/resources/test_files/runtime/TreatError8.jq b/src/test/resources/test_files/runtime/TreatError8.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError8.jq
rename to src/test/resources/test_files/runtime/TreatError8.jq
diff --git a/src/main/resources/test_files/runtime/TreatError9.jq b/src/test/resources/test_files/runtime/TreatError9.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TreatError9.jq
rename to src/test/resources/test_files/runtime/TreatError9.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/ChechArgumentBuiltinFunction2.jq b/src/test/resources/test_files/runtime/TypeChecking/ChechArgumentBuiltinFunction2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/ChechArgumentBuiltinFunction2.jq
rename to src/test/resources/test_files/runtime/TypeChecking/ChechArgumentBuiltinFunction2.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/CheckArgumentsBuiltinFunction1.jq b/src/test/resources/test_files/runtime/TypeChecking/CheckArgumentsBuiltinFunction1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/CheckArgumentsBuiltinFunction1.jq
rename to src/test/resources/test_files/runtime/TypeChecking/CheckArgumentsBuiltinFunction1.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/ForClauseType2.jq b/src/test/resources/test_files/runtime/TypeChecking/ForClauseType2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/ForClauseType2.jq
rename to src/test/resources/test_files/runtime/TypeChecking/ForClauseType2.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/ForClauseType3.jq b/src/test/resources/test_files/runtime/TypeChecking/ForClauseType3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/ForClauseType3.jq
rename to src/test/resources/test_files/runtime/TypeChecking/ForClauseType3.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/ForClauseType4.jq b/src/test/resources/test_files/runtime/TypeChecking/ForClauseType4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/ForClauseType4.jq
rename to src/test/resources/test_files/runtime/TypeChecking/ForClauseType4.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/ForClauseTypeError1.jq b/src/test/resources/test_files/runtime/TypeChecking/ForClauseTypeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/ForClauseTypeError1.jq
rename to src/test/resources/test_files/runtime/TypeChecking/ForClauseTypeError1.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/ForClauseTypeError2.jq b/src/test/resources/test_files/runtime/TypeChecking/ForClauseTypeError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/ForClauseTypeError2.jq
rename to src/test/resources/test_files/runtime/TypeChecking/ForClauseTypeError2.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/GroupByClauseType1.jq b/src/test/resources/test_files/runtime/TypeChecking/GroupByClauseType1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/GroupByClauseType1.jq
rename to src/test/resources/test_files/runtime/TypeChecking/GroupByClauseType1.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/GroupByClauseType2.jq b/src/test/resources/test_files/runtime/TypeChecking/GroupByClauseType2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/GroupByClauseType2.jq
rename to src/test/resources/test_files/runtime/TypeChecking/GroupByClauseType2.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/LetClauseType1.jq b/src/test/resources/test_files/runtime/TypeChecking/LetClauseType1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/LetClauseType1.jq
rename to src/test/resources/test_files/runtime/TypeChecking/LetClauseType1.jq
diff --git a/src/main/resources/test_files/runtime/TypeChecking/LetClauseTypeError1.jq b/src/test/resources/test_files/runtime/TypeChecking/LetClauseTypeError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/TypeChecking/LetClauseTypeError1.jq
rename to src/test/resources/test_files/runtime/TypeChecking/LetClauseTypeError1.jq
diff --git a/src/main/resources/test_files/runtime/UnquotedStringLookup.jq b/src/test/resources/test_files/runtime/UnquotedStringLookup.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/UnquotedStringLookup.jq
rename to src/test/resources/test_files/runtime/UnquotedStringLookup.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclaration1.jq b/src/test/resources/test_files/runtime/VariableDeclaration1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclaration1.jq
rename to src/test/resources/test_files/runtime/VariableDeclaration1.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclaration2.jq b/src/test/resources/test_files/runtime/VariableDeclaration2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclaration2.jq
rename to src/test/resources/test_files/runtime/VariableDeclaration2.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclaration4.jq b/src/test/resources/test_files/runtime/VariableDeclaration4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclaration4.jq
rename to src/test/resources/test_files/runtime/VariableDeclaration4.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclaration5.jq b/src/test/resources/test_files/runtime/VariableDeclaration5.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclaration5.jq
rename to src/test/resources/test_files/runtime/VariableDeclaration5.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclaration6.jq b/src/test/resources/test_files/runtime/VariableDeclaration6.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclaration6.jq
rename to src/test/resources/test_files/runtime/VariableDeclaration6.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclaration7.jq b/src/test/resources/test_files/runtime/VariableDeclaration7.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclaration7.jq
rename to src/test/resources/test_files/runtime/VariableDeclaration7.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclarationError1.jq b/src/test/resources/test_files/runtime/VariableDeclarationError1.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclarationError1.jq
rename to src/test/resources/test_files/runtime/VariableDeclarationError1.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclarationError2.jq b/src/test/resources/test_files/runtime/VariableDeclarationError2.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclarationError2.jq
rename to src/test/resources/test_files/runtime/VariableDeclarationError2.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclarationError3.jq b/src/test/resources/test_files/runtime/VariableDeclarationError3.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclarationError3.jq
rename to src/test/resources/test_files/runtime/VariableDeclarationError3.jq
diff --git a/src/main/resources/test_files/runtime/VariableDeclarationError4.jq b/src/test/resources/test_files/runtime/VariableDeclarationError4.jq
similarity index 100%
rename from src/main/resources/test_files/runtime/VariableDeclarationError4.jq
rename to src/test/resources/test_files/runtime/VariableDeclarationError4.jq
diff --git a/src/main/resources/test_files/semantics/FlowrBasic.jq b/src/test/resources/test_files/semantics/FlowrBasic.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/FlowrBasic.jq
rename to src/test/resources/test_files/semantics/FlowrBasic.jq
diff --git a/src/main/resources/test_files/semantics/FlowrInternalVariable.jq b/src/test/resources/test_files/semantics/FlowrInternalVariable.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/FlowrInternalVariable.jq
rename to src/test/resources/test_files/semantics/FlowrInternalVariable.jq
diff --git a/src/main/resources/test_files/semantics/FlowrMultipleVars.jq b/src/test/resources/test_files/semantics/FlowrMultipleVars.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/FlowrMultipleVars.jq
rename to src/test/resources/test_files/semantics/FlowrMultipleVars.jq
diff --git a/src/main/resources/test_files/semantics/FlowrNests.jq b/src/test/resources/test_files/semantics/FlowrNests.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/FlowrNests.jq
rename to src/test/resources/test_files/semantics/FlowrNests.jq
diff --git a/src/main/resources/test_files/semantics/FlowrVarRedeclaration.jq b/src/test/resources/test_files/semantics/FlowrVarRedeclaration.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/FlowrVarRedeclaration.jq
rename to src/test/resources/test_files/semantics/FlowrVarRedeclaration.jq
diff --git a/src/main/resources/test_files/semantics/OrExpression.jq b/src/test/resources/test_files/semantics/OrExpression.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/OrExpression.jq
rename to src/test/resources/test_files/semantics/OrExpression.jq
diff --git a/src/main/resources/test_files/semantics/TypesCheck.jq b/src/test/resources/test_files/semantics/TypesCheck.jq
similarity index 100%
rename from src/main/resources/test_files/semantics/TypesCheck.jq
rename to src/test/resources/test_files/semantics/TypesCheck.jq