diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.2.query.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.2.query.aql
deleted file mode 100644
index 0d44222..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.2.query.aql
+++ /dev/null
@@ -1,4 +0,0 @@
-avg( 
- for $x in [1.0, 2.0, double("3.0")] 
- return $x
-)
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.2.update.aql
new file mode 100644
index 0000000..d19ec68
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.2.update.aql
@@ -0,0 +1,10 @@
+drop dataverse test if exists;
+
+create dataverse test;
+
+use dataverse test;
+
+
+
+
+
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.3.query.aql
new file mode 100644
index 0000000..d19ec68
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double/avg_double.3.query.aql
@@ -0,0 +1,10 @@
+drop dataverse test if exists;
+
+create dataverse test;
+
+use dataverse test;
+
+
+
+
+
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_01/count_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/count_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/count_01/count_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_01/count_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_01/count_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_01/count_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_01/count_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01/count_empty_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01/count_empty_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01/count_empty_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01/count_empty_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01/count_empty_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_01/count_empty_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02/count_empty_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02/count_empty_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02/count_empty_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02/count_empty_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02/count_empty_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_empty_02/count_empty_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_nu/count_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/count_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/count_nu/count_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_nu/count_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_nu/count_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/count_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/count_nu/count_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/count_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/count_nu/count_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/droptype.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/droptype/droptype.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/droptype.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/droptype/droptype.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/droptype.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/droptype/droptype.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/droptype.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/droptype/droptype.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/droptype.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/droptype/droptype.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/droptype.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/droptype/droptype.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01/global-avg_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01/global-avg_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01/global-avg_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01/global-avg_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01/global-avg_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_01/global-avg_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_nu/global-avg_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_nu/global-avg_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_nu/global-avg_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_nu/global-avg_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_nu/global-avg_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/global-avg_nu/global-avg_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01/max_empty_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01/max_empty_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01/max_empty_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01/max_empty_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01/max_empty_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_01/max_empty_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02/max_empty_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02/max_empty_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02/max_empty_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02/max_empty_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02/max_empty_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/max_empty_02/max_empty_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01/min_empty_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01/min_empty_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01/min_empty_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01/min_empty_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01/min_empty_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_01/min_empty_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02/min_empty_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02/min_empty_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02/min_empty_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02/min_empty_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02/min_empty_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/min_empty_02/min_empty_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double/ocal-avg_double.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double/ocal-avg_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double/ocal-avg_double.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double/ocal-avg_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double/ocal-avg_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double/ocal-avg_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double_nu/ocal-avg_double_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double_nu/ocal-avg_double_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double_nu/ocal-avg_double_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double_nu/ocal-avg_double_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double_nu/ocal-avg_double_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_double_nu/ocal-avg_double_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float/ocal-avg_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float/ocal-avg_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float/ocal-avg_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float/ocal-avg_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float/ocal-avg_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float/ocal-avg_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float_nu/ocal-avg_float_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float_nu/ocal-avg_float_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float_nu/ocal-avg_float_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float_nu/ocal-avg_float_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float_nu/ocal-avg_float_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_float_nu/ocal-avg_float_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16/ocal-avg_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16/ocal-avg_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16/ocal-avg_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16/ocal-avg_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16/ocal-avg_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16/ocal-avg_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16_nu/ocal-avg_int16_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16_nu/ocal-avg_int16_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16_nu/ocal-avg_int16_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16_nu/ocal-avg_int16_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16_nu/ocal-avg_int16_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int16_nu/ocal-avg_int16_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32/ocal-avg_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32/ocal-avg_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32/ocal-avg_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32/ocal-avg_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32/ocal-avg_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32/ocal-avg_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32_nu/ocal-avg_int32_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32_nu/ocal-avg_int32_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32_nu/ocal-avg_int32_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32_nu/ocal-avg_int32_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32_nu/ocal-avg_int32_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int32_nu/ocal-avg_int32_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64/ocal-avg_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64/ocal-avg_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64/ocal-avg_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64/ocal-avg_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64/ocal-avg_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64/ocal-avg_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64_nu/ocal-avg_int64_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64_nu/ocal-avg_int64_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64_nu/ocal-avg_int64_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64_nu/ocal-avg_int64_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64_nu/ocal-avg_int64_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int64_nu/ocal-avg_int64_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8/ocal-avg_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8/ocal-avg_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8/ocal-avg_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8/ocal-avg_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8/ocal-avg_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8/ocal-avg_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8_nu/ocal-avg_int8_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8_nu/ocal-avg_int8_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8_nu/ocal-avg_int8_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8_nu/ocal-avg_int8_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8_nu/ocal-avg_int8_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/local-avg_int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/ocal-avg_int8_nu/ocal-avg_int8_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg/scalar_avg.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg/scalar_avg.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg/scalar_avg.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg/scalar_avg.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg/scalar_avg.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg/scalar_avg.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty/scalar_avg_empty.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty/scalar_avg_empty.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty/scalar_avg_empty.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty/scalar_avg_empty.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_nu/scalar_avg_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_nu/scalar_avg_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_nu/scalar_avg_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_nu/scalar_avg_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_nu/scalar_avg_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_avg_nu/scalar_avg_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count/scalar_count.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count/scalar_count.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count/scalar_count.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count/scalar_count.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count/scalar_count.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count/scalar_count.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty/scalar_count_empty.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty/scalar_count_empty.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty/scalar_count_empty.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty/scalar_count_empty.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty/scalar_count_empty.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_empty/scalar_count_empty.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_nu/scalar_count_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_nu/scalar_count_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_nu/scalar_count_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_nu/scalar_count_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_nu/scalar_count_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_count_nu/scalar_count_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max/scalar_max.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max/scalar_max.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max/scalar_max.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max/scalar_max.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max/scalar_max.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max/scalar_max.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty/scalar_max_empty.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty/scalar_max_empty.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty/scalar_max_empty.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty/scalar_max_empty.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty/scalar_max_empty.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_empty/scalar_max_empty.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_nu/scalar_max_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_nu/scalar_max_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_nu/scalar_max_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_nu/scalar_max_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_nu/scalar_max_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_max_nu/scalar_max_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min/scalar_min.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min/scalar_min.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min/scalar_min.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min/scalar_min.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min/scalar_min.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min/scalar_min.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty/scalar_min_empty.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty/scalar_min_empty.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty/scalar_min_empty.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty/scalar_min_empty.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty/scalar_min_empty.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_empty/scalar_min_empty.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_nu/scalar_min_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_nu/scalar_min_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_nu/scalar_min_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_nu/scalar_min_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_nu/scalar_min_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_min_nu/scalar_min_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum/scalar_sum.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum/scalar_sum.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum/scalar_sum.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum/scalar_sum.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum/scalar_sum.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum/scalar_sum.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty/scalar_sum_empty.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty/scalar_sum_empty.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty/scalar_sum_empty.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty/scalar_sum_empty.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty/scalar_sum_empty.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_empty/scalar_sum_empty.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_nu/scalar_sum_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_nu/scalar_sum_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_nu/scalar_sum_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_nu/scalar_sum_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_nu/scalar_sum_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/scalar_sum_nu/scalar_sum_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double/sum_double.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double/sum_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double/sum_double.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double/sum_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double/sum_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double/sum_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_nu/sum_double_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_nu/sum_double_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_nu/sum_double_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_nu/sum_double_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_nu/sum_double_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_double_nu/sum_double_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01/sum_empty_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01/sum_empty_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01/sum_empty_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01/sum_empty_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01/sum_empty_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_01/sum_empty_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02/sum_empty_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02/sum_empty_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02/sum_empty_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02/sum_empty_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02/sum_empty_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_empty_02/sum_empty_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float/sum_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float/sum_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float/sum_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float/sum_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float/sum_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float/sum_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_nu/sum_float_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_nu/sum_float_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_nu/sum_float_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_nu/sum_float_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_nu/sum_float_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_float_nu/sum_float_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16/sum_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16/sum_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16/sum_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16/sum_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16/sum_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16/sum_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_nu/sum_int16_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_nu/sum_int16_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_nu/sum_int16_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_nu/sum_int16_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_nu/sum_int16_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int16_nu/sum_int16_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32/sum_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32/sum_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32/sum_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32/sum_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32/sum_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32/sum_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_nu/sum_int32_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_nu/sum_int32_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_nu/sum_int32_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_nu/sum_int32_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_nu/sum_int32_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int32_nu/sum_int32_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64/sum_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64/sum_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64/sum_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64/sum_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64/sum_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64/sum_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_nu/sum_int64_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_nu/sum_int64_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_nu/sum_int64_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_nu/sum_int64_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_nu/sum_int64_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int64_nu/sum_int64_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8/sum_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8/sum_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8/sum_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8/sum_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8/sum_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8/sum_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_nu/sum_int8_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_nu/sum_int8_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_nu/sum_int8_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_nu/sum_int8_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_nu/sum_int8_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_int8_nu/sum_int8_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_nu/sum_numeric_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_nu/sum_numeric_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_nu/sum_numeric_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_nu/sum_numeric_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_nu/sum_numeric_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/sum_numeric_nu/sum_numeric_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double/vg_double.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double/vg_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double/vg_double.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double/vg_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double/vg_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double/vg_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double_nu/vg_double_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double_nu/vg_double_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double_nu/vg_double_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double_nu/vg_double_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double_nu/vg_double_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_double_nu/vg_double_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_01/vg_empty_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_01/vg_empty_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_01/vg_empty_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_01/vg_empty_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_01.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_01/vg_empty_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_01/vg_empty_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_02/vg_empty_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_02/vg_empty_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_02/vg_empty_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_02/vg_empty_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_02.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_02/vg_empty_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_empty_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_empty_02/vg_empty_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float/vg_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float/vg_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float/vg_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float/vg_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float/vg_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float/vg_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float_nu/vg_float_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float_nu/vg_float_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float_nu/vg_float_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float_nu/vg_float_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float_nu/vg_float_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_float_nu/vg_float_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16/vg_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16/vg_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16/vg_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16/vg_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16/vg_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16/vg_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16_nu/vg_int16_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16_nu/vg_int16_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16_nu/vg_int16_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16_nu/vg_int16_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16_nu/vg_int16_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int16_nu/vg_int16_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32/vg_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32/vg_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32/vg_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32/vg_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32/vg_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32/vg_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32_nu/vg_int32_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32_nu/vg_int32_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32_nu/vg_int32_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32_nu/vg_int32_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32_nu/vg_int32_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int32_nu/vg_int32_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64/vg_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64/vg_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64/vg_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64/vg_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64/vg_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64/vg_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64_nu/vg_int64_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64_nu/vg_int64_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64_nu/vg_int64_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64_nu/vg_int64_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64_nu/vg_int64_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int64_nu/vg_int64_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8/vg_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8/vg_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8/vg_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8/vg_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8/vg_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8/vg_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8_nu/vg_int8_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8_nu/vg_int8_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8_nu/vg_int8_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8_nu/vg_int8_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8_nu/vg_int8_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/aggregate/avg_int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/aggregate/vg_int8_nu/vg_int8_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_01.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_01/nd_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/boolean/and_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/boolean/nd_01/nd_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_01.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_01/nd_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/and_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/nd_01/nd_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_01.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_01/nd_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/and_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/nd_01/nd_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_null.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_nu/nd_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/boolean/and_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/boolean/nd_nu/nd_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_null.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_nu/nd_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/and_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/nd_nu/nd_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_null.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_nu/nd_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/and_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/nd_nu/nd_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_null_false.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_null_false/nd_null_false.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/and_null_false.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/nd_null_false/nd_null_false.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_null_false.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_null_false/nd_null_false.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/boolean/and_null_false.aql
rename to asterix-app/src/test/resources/runtimets/queries/boolean/nd_null_false/nd_null_false.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/and_null_false.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/nd_null_false/nd_null_false.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/and_null_false.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/nd_null_false/nd_null_false.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/not_01.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/not_01/not_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/boolean/not_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/boolean/not_01/not_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/not_01.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/not_01/not_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/not_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/not_01/not_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/boolean/not_01.aql b/asterix-app/src/test/resources/runtimets/queries/boolean/not_01/not_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/boolean/not_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/boolean/not_01/not_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/date_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/date_order/date_order.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/date_order.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/date_order/date_order.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/date_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/date_order/date_order.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/date_order.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/date_order/date_order.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/date_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/date_order/date_order.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/date_order.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/date_order/date_order.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order/datetime_order.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order/datetime_order.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order/datetime_order.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order/datetime_order.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order/datetime_order.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_order/datetime_order.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range/datetime_range.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range/datetime_range.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range/datetime_range.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range/datetime_range.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range/datetime_range.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range/datetime_range.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tzeq.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tze/datetime_tze.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tzeq.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tze/datetime_tze.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tzeq.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tze/datetime_tze.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tzeq.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tze/datetime_tze.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tzeq.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tze/datetime_tze.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tzeq.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/datetime_tze/datetime_tze.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double/double.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/double.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/double/double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double/double.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/double.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/double/double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double/double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/double.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/double/double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01/double_gte_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01/double_gte_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01/double_gte_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01/double_gte_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01/double_gte_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/double_gte_01/double_gte_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double_nu/double_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/double_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/double_nu/double_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double_nu/double_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/double_nu/double_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/double_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/double_nu/double_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/double_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/double_nu/double_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/eq_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/eq_01/eq_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/eq_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/eq_01/eq_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/eq_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/eq_01/eq_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/eq_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/eq_01/eq_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/eq_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/eq_01/eq_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/eq_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/eq_01/eq_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/float.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/float/float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/float.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/float/float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/float.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/float/float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/float.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/float/float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/float.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/float/float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/float.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/float/float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/float_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/float_nu/float_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/float_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/float_nu/float_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/float_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/float_nu/float_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/float_nu/float_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/float_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/float_nu/float_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/float_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/float_nu/float_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/gt_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/gt_01/gt_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/gt_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/gt_01/gt_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/gt_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/gt_01/gt_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/gt_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/gt_01/gt_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/gt_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/gt_01/gt_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/gt_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/gt_01/gt_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/gte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/gte_01/gte_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/gte_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/gte_01/gte_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/gte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/gte_01/gte_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/gte_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/gte_01/gte_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/gte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/gte_01/gte_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/gte_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/gte_01/gte_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int16.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int16/int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int16/int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int16.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int16/int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int16/int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int16.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int16/int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int16/int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int16_nu/int16_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int16_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int16_nu/int16_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int16_nu/int16_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int16_nu/int16_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int16_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int16_nu/int16_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int16_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int16_nu/int16_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int32.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int32/int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int32/int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int32.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int32/int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int32/int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int32.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int32/int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int32/int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int32_nu/int32_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int32_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int32_nu/int32_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int32_nu/int32_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int32_nu/int32_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int32_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int32_nu/int32_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int32_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int32_nu/int32_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int64.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int64/int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int64/int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int64.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int64/int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int64/int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int64.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int64/int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int64/int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int64_nu/int64_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int64_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int64_nu/int64_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int64_nu/int64_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int64_nu/int64_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int64_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int64_nu/int64_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int64_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int64_nu/int64_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int8.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int8/int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int8/int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int8.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int8/int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int8/int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int8.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int8/int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int8/int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int8_nu/int8_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/int8_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/int8_nu/int8_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int8_nu/int8_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int8_nu/int8_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/int8_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/int8_nu/int8_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/int8_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/int8_nu/int8_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/neq_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/neq_01/neq_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/neq_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/neq_01/neq_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/neq_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/neq_01/neq_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/neq_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/neq_01/neq_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/neq_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/neq_01/neq_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/neq_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/neq_01/neq_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01/numeric-comparison_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01/numeric-comparison_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01/numeric-comparison_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01/numeric-comparison_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01/numeric-comparison_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/numeric-comparison_01/numeric-comparison_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/string.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/string/string.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/string.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/string/string.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/string.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/string/string.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/string.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/string/string.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/string.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/string/string.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/string.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/string/string.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/string_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/string_nu/string_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/string_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/string_nu/string_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/string_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/string_nu/string_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/string_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/string_nu/string_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/string_null.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/string_nu/string_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/string_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/string_nu/string_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/lt_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/t_01/t_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/lt_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/t_01/t_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/lt_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/t_01/t_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/lt_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/t_01/t_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/lt_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/t_01/t_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/lt_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/t_01/t_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/lte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/te_01/te_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/lte_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/te_01/te_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/lte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/te_01/te_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/lte_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/te_01/te_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/lte_01.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/te_01/te_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/lte_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/te_01/te_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/time_order/time_order.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql
rename to asterix-app/src/test/resources/runtimets/queries/comparison/time_order/time_order.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/time_order/time_order.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/time_order/time_order.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/time_order/time_order.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql
copy to asterix-app/src/test/resources/runtimets/queries/comparison/time_order/time_order.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01/boolean_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01/boolean_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01/boolean_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01/boolean_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01/boolean_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/boolean_01/boolean_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/circle_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/circle_01/circle_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/circle_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/circle_01/circle_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/circle_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/circle_01/circle_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/circle_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/circle_01/circle_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/circle_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/circle_01/circle_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/circle_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/circle_01/circle_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/date_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/date_01/date_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/date_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/date_01/date_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/date_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/date_01/date_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/date_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/date_01/date_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/date_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/date_01/date_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/date_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/date_01/date_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01/datetime_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01/datetime_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01/datetime_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01/datetime_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01/datetime_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/datetime_01/datetime_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/add-null.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/dd-nu/dd-nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/add-null.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/dd-nu/dd-nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/add-null.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/dd-nu/dd-nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/add-null.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/dd-nu/dd-nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/add-null.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/dd-nu/dd-nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/add-null.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/dd-nu/dd-nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/double_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/double_01/double_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/double_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/double_01/double_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/double_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/double_01/double_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/double_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/double_01/double_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/double_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/double_01/double_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/double_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/double_01/double_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/duration_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/duration_01/duration_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/duration_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/duration_01/duration_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/duration_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/duration_01/duration_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/duration_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/duration_01/duration_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/duration_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/duration_01/duration_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/duration_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/duration_01/duration_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/float_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/float_01/float_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/float_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/float_01/float_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/float_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/float_01/float_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/float_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/float_01/float_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/float_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/float_01/float_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/float_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/float_01/float_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/line_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/ine_01/ine_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/line_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/ine_01/ine_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/line_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/ine_01/ine_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/line_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/ine_01/ine_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/line_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/ine_01/ine_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/line_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/ine_01/ine_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/int_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/int_01/int_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/int_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/int_01/int_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/int_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/int_01/int_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/int_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/int_01/int_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/int_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/int_01/int_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/int_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/int_01/int_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/interval.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/interv/interv.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/interval.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/interv/interv.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/interval.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/interv/interv.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/interval.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/interv/interv.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/interval.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/interv/interv.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/interval.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/interv/interv.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/point_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/point_01/point_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/point_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/point_01/point_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/point_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/point_01/point_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/point_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/point_01/point_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/point_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/point_01/point_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/point_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/point_01/point_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01/polygon_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01/polygon_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01/polygon_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01/polygon_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01/polygon_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/polygon_01/polygon_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01/primitive-01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01/primitive-01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01/primitive-01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01/primitive-01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01/primitive-01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-01/primitive-01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02/primitive-02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02/primitive-02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02/primitive-02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02/primitive-02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02/primitive-02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-02/primitive-02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03/primitive-03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03/primitive-03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03/primitive-03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03/primitive-03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03/primitive-03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-03/primitive-03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04/primitive-04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04/primitive-04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04/primitive-04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04/primitive-04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04/primitive-04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/primitive-04/primitive-04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/string_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/string_01/string_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/string_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/string_01/string_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/string_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/string_01/string_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/string_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/string_01/string_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/string_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/string_01/string_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/string_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/string_01/string_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/time_01/time_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/constructor/time_01/time_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/time_01/time_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/time_01/time_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/time_01/time_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/constructor/time_01/time_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset.aql
rename to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/co.aql b/asterix-app/src/test/resources/runtimets/queries/custord/co/co.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/co.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/co/co.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/co.aql b/asterix-app/src/test/resources/runtimets/queries/custord/co/co.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/co.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/co/co.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/co.aql b/asterix-app/src/test/resources/runtimets/queries/custord/co/co.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/co.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/co/co.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01/customer_q_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01/customer_q_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01/customer_q_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01/customer_q_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01/customer_q_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01/customer_q_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02/customer_q_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02/customer_q_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02/customer_q_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02/customer_q_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02/customer_q_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_02/customer_q_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03/customer_q_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03/customer_q_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03/customer_q_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03/customer_q_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03/customer_q_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_03/customer_q_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04/customer_q_04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04/customer_q_04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04/customer_q_04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04/customer_q_04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04/customer_q_04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_04/customer_q_04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05/customer_q_05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05/customer_q_05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05/customer_q_05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05/customer_q_05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05/customer_q_05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_05/customer_q_05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06/customer_q_06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06/customer_q_06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06/customer_q_06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06/customer_q_06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06/customer_q_06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_06/customer_q_06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07/customer_q_07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07/customer_q_07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07/customer_q_07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07/customer_q_07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07/customer_q_07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_07/customer_q_07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08/customer_q_08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08/customer_q_08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08/customer_q_08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08/customer_q_08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08/customer_q_08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/customer_q_08/customer_q_08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01/denorm-cust-order_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01/denorm-cust-order_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01/denorm-cust-order_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01/denorm-cust-order_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01/denorm-cust-order_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01/denorm-cust-order_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02/denorm-cust-order_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02/denorm-cust-order_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02/denorm-cust-order_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02/denorm-cust-order_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02/denorm-cust-order_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02/denorm-cust-order_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03/denorm-cust-order_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03/denorm-cust-order_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03/denorm-cust-order_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03/denorm-cust-order_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03/denorm-cust-order_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03/denorm-cust-order_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql b/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk/freq-clerk.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk/freq-clerk.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql b/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk/freq-clerk.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk/freq-clerk.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql b/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk/freq-clerk.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk/freq-clerk.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01/join_q_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/join_q_01/join_q_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01/join_q_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_01/join_q_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01/join_q_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_01/join_q_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_02/join_q_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/join_q_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/join_q_02/join_q_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_02/join_q_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_02/join_q_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_02/join_q_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_02/join_q_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_03/join_q_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/join_q_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/join_q_03/join_q_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_03/join_q_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_03/join_q_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_03/join_q_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_03/join_q_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_04/join_q_04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/join_q_04.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/join_q_04/join_q_04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_04/join_q_04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_04/join_q_04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_04/join_q_04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/join_q_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/join_q_04/join_q_04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql b/asterix-app/src/test/resources/runtimets/queries/custord/oad-test/oad-test.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/oad-test/oad-test.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql b/asterix-app/src/test/resources/runtimets/queries/custord/oad-test/oad-test.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/oad-test/oad-test.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql b/asterix-app/src/test/resources/runtimets/queries/custord/oad-test/oad-test.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/oad-test/oad-test.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01/order_q_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/order_q_01/order_q_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01/order_q_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_01/order_q_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01/order_q_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_01/order_q_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02/order_q_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/order_q_02/order_q_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02/order_q_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_02/order_q_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02/order_q_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_02/order_q_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_03/order_q_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/order_q_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/order_q_03/order_q_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_03/order_q_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_03/order_q_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_03/order_q_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_03/order_q_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04/order_q_04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/order_q_04/order_q_04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04/order_q_04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_04/order_q_04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04/order_q_04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_04/order_q_04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_05.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_05/order_q_05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/order_q_05.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/order_q_05/order_q_05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_05.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_05/order_q_05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_05.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_05/order_q_05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_05.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_05/order_q_05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_05.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_05/order_q_05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_06.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_06/order_q_06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/custord/order_q_06.aql
rename to asterix-app/src/test/resources/runtimets/queries/custord/order_q_06/order_q_06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_06.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_06/order_q_06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_06.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_06/order_q_06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_06.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_06/order_q_06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/custord/order_q_06.aql
copy to asterix-app/src/test/resources/runtimets/queries/custord/order_q_06/order_q_06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/1/1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql
rename to asterix-app/src/test/resources/runtimets/queries/dapd/1/1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/1/1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql
copy to asterix-app/src/test/resources/runtimets/queries/dapd/1/1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/1/1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql
copy to asterix-app/src/test/resources/runtimets/queries/dapd/1/1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/2/2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql
rename to asterix-app/src/test/resources/runtimets/queries/dapd/2/2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/2/2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql
copy to asterix-app/src/test/resources/runtimets/queries/dapd/2/2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/2/2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql
copy to asterix-app/src/test/resources/runtimets/queries/dapd/2/2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/3/3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql
rename to asterix-app/src/test/resources/runtimets/queries/dapd/3/3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/3/3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql
copy to asterix-app/src/test/resources/runtimets/queries/dapd/3/3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/3/3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql
copy to asterix-app/src/test/resources/runtimets/queries/dapd/3/3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype.aql b/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype/create-drop-cltype.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype/create-drop-cltype.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype.aql b/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype/create-drop-cltype.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype/create-drop-cltype.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype.aql b/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype/create-drop-cltype.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/create-drop-cltype/create-drop-cltype.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype.aql b/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype/create-drop-opntype.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype/create-drop-opntype.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype.aql b/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype/create-drop-opntype.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype/create-drop-opntype.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype.aql b/asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype/create-drop-opntype.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/create-drop-opntype/create-drop-opntype.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes.aql b/asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes.aql b/asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes.aql b/asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/drop-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/drop-index/drop-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/drop-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/drop-index/drop-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/drop-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/drop-index/drop-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/drop-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/drop-index/drop-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/drop-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/drop-index/drop-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/drop-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/drop-index/drop-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index/empty-load-with-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index/empty-load-with-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index/empty-load-with-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index/empty-load-with-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index/empty-load-with-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/empty-load-with-index/empty-load-with-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/empty-load.aql b/asterix-app/src/test/resources/runtimets/queries/dml/empty-load/empty-load.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/empty-load.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/empty-load/empty-load.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/empty-load.aql b/asterix-app/src/test/resources/runtimets/queries/dml/empty-load/empty-load.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/empty-load.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/empty-load/empty-load.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/empty-load.aql b/asterix-app/src/test/resources/runtimets/queries/dml/empty-load/empty-load.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/empty-load.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/empty-load/empty-load.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset/insert-into-empty-dataset.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset/insert-into-empty-dataset.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset/insert-into-empty-dataset.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset/insert-into-empty-dataset.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01/insert-src-dst-01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01/insert-src-dst-01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01/insert-src-dst-01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01/insert-src-dst-01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01/insert-src-dst-01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-src-dst-01/insert-src-dst-01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert/insert.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert/insert.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert/insert.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert/insert.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert/insert.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert/insert.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc/insert_less_nc.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc/insert_less_nc.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc/insert_less_nc.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc/insert_less_nc.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc/insert_less_nc.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc/insert_less_nc.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/dml/oad-from-hdfs/oad-from-hdfs.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/oad-from-hdfs/oad-from-hdfs.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/dml/oad-from-hdfs/oad-from-hdfs.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/oad-from-hdfs/oad-from-hdfs.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/dml/oad-from-hdfs/oad-from-hdfs.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/oad-from-hdfs/oad-from-hdfs.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/oad-with-index/oad-with-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/oad-with-index/oad-with-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/oad-with-index/oad-with-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/oad-with-index/oad-with-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/oad-with-index/oad-with-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/oad-with-index/oad-with-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive/opentype-c2o-recursive.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive/opentype-c2o-recursive.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive/opentype-c2o-recursive.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o-recursive/opentype-c2o-recursive.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o/opentype-c2o.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o/opentype-c2o.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o/opentype-c2o.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o/opentype-c2o.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o/opentype-c2o.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-c2o/opentype-c2o.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-optional.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-option/opentype-closed-option.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-optional.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-option/opentype-closed-option.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-optional.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-option/opentype-closed-option.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-optional.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-option/opentype-closed-option.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-optional.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-option/opentype-closed-option.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-optional.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-closed-option/opentype-closed-option.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert/opentype-insert.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert/opentype-insert.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert/opentype-insert.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert/opentype-insert.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert/opentype-insert.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert/opentype-insert.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand/opentype-noexpand.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand/opentype-noexpand.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand/opentype-noexpand.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand/opentype-noexpand.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand/opentype-noexpand.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-noexpand/opentype-noexpand.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive/opentype-o2c-recursive.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive/opentype-o2c-recursive.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive/opentype-o2c-recursive.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c-recursive/opentype-o2c-recursive.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c/opentype-o2c.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c/opentype-o2c.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c/opentype-o2c.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c/opentype-o2c.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c/opentype-o2c.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2c/opentype-o2c.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o/opentype-o2o.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o/opentype-o2o.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o/opentype-o2o.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o/opentype-o2o.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o/opentype-o2o.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/opentype-o2o/opentype-o2o.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/query-issue205.aql b/asterix-app/src/test/resources/runtimets/queries/dml/uery-issue205/uery-issue205.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/dml/query-issue205.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/uery-issue205/uery-issue205.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/query-issue205.aql b/asterix-app/src/test/resources/runtimets/queries/dml/uery-issue205/uery-issue205.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/query-issue205.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/uery-issue205/uery-issue205.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/query-issue205.aql b/asterix-app/src/test/resources/runtimets/queries/dml/uery-issue205/uery-issue205.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/dml/query-issue205.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/uery-issue205/uery-issue205.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/employee/q_01.aql b/asterix-app/src/test/resources/runtimets/queries/employee/_01/_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/employee/q_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/employee/_01/_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/employee/q_01.aql b/asterix-app/src/test/resources/runtimets/queries/employee/_01/_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/employee/q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/employee/_01/_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/employee/q_01.aql b/asterix-app/src/test/resources/runtimets/queries/employee/_01/_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/employee/q_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/employee/_01/_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/employee/q_02.aql b/asterix-app/src/test/resources/runtimets/queries/employee/_02/_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/employee/q_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/employee/_02/_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/employee/q_02.aql b/asterix-app/src/test/resources/runtimets/queries/employee/_02/_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/employee/q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/employee/_02/_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/employee/q_02.aql b/asterix-app/src/test/resources/runtimets/queries/employee/_02/_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/employee/q_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/employee/_02/_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql b/asterix-app/src/test/resources/runtimets/queries/failure/1_pricing_summary_report_failure/1_pricing_summary_report_failure.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/1_pricing_summary_report_failure/1_pricing_summary_report_failure.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql b/asterix-app/src/test/resources/runtimets/queries/failure/1_pricing_summary_report_failure/1_pricing_summary_report_failure.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/1_pricing_summary_report_failure/1_pricing_summary_report_failure.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql b/asterix-app/src/test/resources/runtimets/queries/failure/1_pricing_summary_report_failure/1_pricing_summary_report_failure.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/1_pricing_summary_report_failure/1_pricing_summary_report_failure.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree/delete-rtree.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree/delete-rtree.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree/delete-rtree.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree/delete-rtree.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree/delete-rtree.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree/delete-rtree.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete/delete.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/delete.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/delete/delete.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete/delete.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/delete.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/delete/delete.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete/delete.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/delete.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/delete/delete.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree/insert-rtree.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree/insert-rtree.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree/insert-rtree.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree/insert-rtree.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree/insert-rtree.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree/insert-rtree.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert/insert.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/insert.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/insert/insert.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert/insert.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/insert/insert.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert/insert.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/insert/insert.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree/verify_delete-rtree.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree/verify_delete-rtree.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree/verify_delete-rtree.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree/verify_delete-rtree.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree/verify_delete-rtree.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_delete-rtree/verify_delete-rtree.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete/verify_delete.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_delete.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_delete/verify_delete.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete/verify_delete.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/verify_delete.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/verify_delete/verify_delete.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_delete/verify_delete.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_delete.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_delete/verify_delete.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree/verify_insert-rtree.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree/verify_insert-rtree.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree/verify_insert-rtree.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree/verify_insert-rtree.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree/verify_insert-rtree.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_insert-rtree/verify_insert-rtree.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert/verify_insert.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/failure/verify_insert.aql
rename to asterix-app/src/test/resources/runtimets/queries/failure/verify_insert/verify_insert.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert/verify_insert.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_insert/verify_insert.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/verify_insert/verify_insert.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/failure/verify_insert.aql
copy to asterix-app/src/test/resources/runtimets/queries/failure/verify_insert/verify_insert.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01/feeds_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01/feeds_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01/feeds_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01/feeds_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01/feeds_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_01/feeds_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02/feeds_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02/feeds_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02/feeds_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02/feeds_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02/feeds_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_02/feeds_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03/feeds_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03/feeds_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03/feeds_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03/feeds_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03/feeds_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_03/feeds_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04.aql
rename to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds/issue_230_feeds.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds.aql
rename to asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds/issue_230_feeds.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds/issue_230_feeds.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds/issue_230_feeds.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds.aql b/asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds/issue_230_feeds.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds.aql
copy to asterix-app/src/test/resources/runtimets/queries/feeds/issue_230_feeds/issue_230_feeds.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et01/et01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let01.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et01/et01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et01/et01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et01/et01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et01/et01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et01/et01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et02/et02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let02.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et02/et02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et02/et02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et02/et02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et02/et02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et02/et02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et03/et03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let03.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et03/et03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et03/et03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et03/et03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et03/et03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et03/et03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et04/et04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let04.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et04/et04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et04/et04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et04/et04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et04/et04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et04/et04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et05/et05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let05.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et05/et05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et05/et05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et05/et05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et05/et05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et05/et05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et06/et06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let06.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et06/et06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et06/et06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et06/et06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et06/et06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et06/et06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et07/et07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let07.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et07/et07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et07/et07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et07/et07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et07/et07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et07/et07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et08/et08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let08.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et08/et08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et08/et08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et08/et08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et08/et08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et08/et08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et09/et09.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let09.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et09/et09.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et09/et09.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et09/et09.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et09/et09.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et09/et09.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et10/et10.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let10.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et10/et10.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et10/et10.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et10/et10.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et10/et10.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et10/et10.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et11/et11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let11.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et11/et11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et11/et11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et11/et11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et11/et11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et11/et11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et12/et12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let12.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et12/et12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et12/et12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et12/et12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et12/et12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et12/et12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et13/et13.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let13.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et13/et13.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et13/et13.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let13.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et13/et13.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et13/et13.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let13.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et13/et13.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et14/et14.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let14.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et14/et14.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et14/et14.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let14.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et14/et14.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et14/et14.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let14.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et14/et14.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et15/et15.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let15.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et15/et15.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et15/et15.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let15.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et15/et15.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et15/et15.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let15.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et15/et15.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et16/et16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let16.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et16/et16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et16/et16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let16.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et16/et16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et16/et16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let16.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et16/et16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et17/et17.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let17.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et17/et17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et17/et17.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let17.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et17/et17.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et17/et17.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let17.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et17/et17.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et18/et18.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let18.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et18/et18.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et18/et18.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let18.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et18/et18.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et18/et18.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let18.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et18/et18.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et19/et19.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let19.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et19/et19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et19/et19.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let19.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et19/et19.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et19/et19.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let19.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et19/et19.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let20.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et20/et20.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let20.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et20/et20.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let20.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et20/et20.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let20.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et20/et20.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let20.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et20/et20.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let20.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et20/et20.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let21.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et21/et21.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let21.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et21/et21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let21.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et21/et21.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let21.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et21/et21.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let21.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et21/et21.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let21.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et21/et21.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let22.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et22/et22.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let22.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et22/et22.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let22.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et22/et22.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let22.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et22/et22.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let22.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et22/et22.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let22.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et22/et22.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let23.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et23/et23.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let23.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et23/et23.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let23.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et23/et23.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let23.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et23/et23.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let23.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et23/et23.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let23.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et23/et23.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let24.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et24/et24.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let24.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et24/et24.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let24.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et24/et24.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let24.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et24/et24.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let24.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et24/et24.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let24.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et24/et24.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let25.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et25/et25.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let25.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et25/et25.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let25.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et25/et25.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let25.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et25/et25.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let25.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et25/et25.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let25.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et25/et25.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let26.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et26/et26.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let26.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et26/et26.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let26.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et26/et26.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let26.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et26/et26.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let26.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et26/et26.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let26.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et26/et26.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let27.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et27/et27.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let27.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et27/et27.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let27.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et27/et27.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let27.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et27/et27.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let27.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et27/et27.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let27.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et27/et27.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let28.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et28/et28.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let28.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et28/et28.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let28.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et28/et28.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let28.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et28/et28.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let28.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et28/et28.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let28.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et28/et28.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let29.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et29/et29.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let29.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et29/et29.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let29.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et29/et29.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let29.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et29/et29.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let29.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et29/et29.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let29.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et29/et29.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let30.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et30/et30.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let30.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et30/et30.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let30.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et30/et30.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let30.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et30/et30.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let30.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et30/et30.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let30.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et30/et30.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let31.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et31/et31.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let31.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et31/et31.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let31.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et31/et31.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let31.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et31/et31.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let31.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et31/et31.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let31.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et31/et31.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let32.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et32/et32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/let32.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/et32/et32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let32.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et32/et32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let32.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et32/et32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/let32.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/et32/et32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/let32.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/et32/et32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for01/for01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for01.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for01/for01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for01/for01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for01/for01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for01/for01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for01/for01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for02/for02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for02.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for02/for02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for02/for02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for02/for02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for02/for02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for02/for02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for03/for03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for03.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for03/for03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for03/for03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for03/for03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for03/for03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for03/for03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for04/for04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for04.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for04/for04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for04/for04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for04/for04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for04/for04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for04/for04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for05/for05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for05.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for05/for05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for05/for05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for05/for05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for05/for05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for05/for05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for06/for06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for06.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for06/for06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for06/for06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for06/for06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for06/for06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for06/for06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for07/for07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for07.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for07/for07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for07/for07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for07/for07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for07/for07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for07/for07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for08/for08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for08.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for08/for08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for08/for08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for08/for08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for08/for08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for08/for08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for09/for09.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for09.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for09/for09.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for09/for09.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for09/for09.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for09/for09.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for09/for09.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for10/for10.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for10.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for10/for10.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for10/for10.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for10/for10.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for10/for10.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for10/for10.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for11/for11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for11.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for11/for11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for11/for11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for11/for11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for11/for11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for11/for11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for12/for12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for12.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for12/for12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for12/for12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for12/for12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for12/for12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for12/for12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for13/for13.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for13.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for13/for13.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for13/for13.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for13.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for13/for13.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for13/for13.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for13.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for13/for13.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for14/for14.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for14.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for14/for14.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for14/for14.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for14.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for14/for14.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for14/for14.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for14.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for14/for14.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for15/for15.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for15.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for15/for15.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for15/for15.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for15.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for15/for15.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for15/for15.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for15.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for15/for15.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for16/for16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for16.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for16/for16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for16/for16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for16.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for16/for16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for16/for16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for16.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for16/for16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for17/for17.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for17.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for17/for17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for17/for17.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for17.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for17/for17.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for17/for17.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for17.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for17/for17.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for18/for18.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for18.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for18/for18.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for18/for18.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for18.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for18/for18.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for18/for18.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for18.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for18/for18.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for19/for19.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/for19.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/for19/for19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for19/for19.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for19.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for19/for19.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/for19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/for19/for19.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/for19.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/for19/for19.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01/grpby01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/grpby01/grpby01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01/grpby01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/grpby01/grpby01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01/grpby01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/grpby01/grpby01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby02.aql
deleted file mode 100644
index 252016f..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby02.aql
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Description      :  Test group by clause of the FLWOR expression
- * Expected Result  :  Success
- * Date             :  31st July 2012
- */
-
-for $sales in [{"storeno":"S101","itemno":"P78395","qty":125},
-{"storeno":"S101","itemno":"P71395","qty":135},
-{"storeno":"S102","itemno":"P78395","qty":225},
-{"storeno":"S103","itemno":"P78345","qty":105},
-{"storeno":"S104","itemno":"P71395","qty":115},
-{"storeno":"S105","itemno":"P74395","qty":120}]
-group by $strNum:=$sales.storeno with $sales
-order by $strNum desc
-return {"store-number":$strNum,"total-qty":sum(for $l in $sales return $l.qty)}
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby02/grpby02.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/grpby02/grpby02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby02/grpby02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/grpby02/grpby02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/grpby02/grpby02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/grpby01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/grpby02/grpby02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01/order-by-01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01/order-by-01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01/order-by-01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01/order-by-01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01/order-by-01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-01/order-by-01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02/order-by-02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02/order-by-02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02/order-by-02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02/order-by-02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02/order-by-02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-02/order-by-02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03/order-by-03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03/order-by-03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03/order-by-03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03/order-by-03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03/order-by-03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-03/order-by-03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04/order-by-04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04/order-by-04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04/order-by-04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04/order-by-04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04/order-by-04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-04/order-by-04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05/order-by-05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05/order-by-05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05/order-by-05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05/order-by-05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05/order-by-05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-05/order-by-05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06/order-by-06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06/order-by-06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06/order-by-06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06/order-by-06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06/order-by-06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-06/order-by-06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07/order-by-07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07/order-by-07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07/order-by-07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07/order-by-07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07/order-by-07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-07/order-by-07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08/order-by-08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08/order-by-08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08/order-by-08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08/order-by-08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08/order-by-08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-08/order-by-08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09/order-by-09.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09/order-by-09.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09/order-by-09.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09/order-by-09.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09/order-by-09.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-09/order-by-09.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10/order-by-10.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10/order-by-10.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10/order-by-10.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10/order-by-10.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10/order-by-10.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-10/order-by-10.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11/order-by-11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11/order-by-11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11/order-by-11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11/order-by-11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11/order-by-11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-11/order-by-11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12/order-by-12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12/order-by-12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12/order-by-12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12/order-by-12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12/order-by-12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/order-by-12/order-by-12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-01/ret-01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-01.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-01/ret-01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-01/ret-01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-01/ret-01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-01.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-01/ret-01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-01/ret-01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-02/ret-02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-02.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-02/ret-02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-02/ret-02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-02/ret-02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-02.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-02/ret-02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-02.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-02/ret-02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-03/ret-03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-03.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-03/ret-03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-03/ret-03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-03/ret-03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-03.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-03/ret-03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-03.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-03/ret-03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-04/ret-04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-04.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-04/ret-04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-04/ret-04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-04/ret-04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-04.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-04/ret-04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-04.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-04/ret-04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-05/ret-05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-05.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-05/ret-05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-05/ret-05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-05/ret-05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-05.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-05/ret-05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-05.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-05/ret-05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-06/ret-06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-06.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-06/ret-06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-06/ret-06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-06/ret-06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-06.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-06/ret-06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-06.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-06/ret-06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-07/ret-07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-07.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-07/ret-07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-07/ret-07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-07/ret-07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-07.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-07/ret-07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-07.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-07/ret-07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-08/ret-08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-08.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-08/ret-08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-08/ret-08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-08/ret-08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-08.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-08/ret-08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-08.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-08/ret-08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-09/ret-09.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-09.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-09/ret-09.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-09/ret-09.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-09/ret-09.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-09.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-09/ret-09.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-09.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-09/ret-09.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-10/ret-10.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-10.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-10/ret-10.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-10/ret-10.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-10/ret-10.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-10.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-10/ret-10.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-10.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-10/ret-10.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-11/ret-11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-11.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-11/ret-11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-11/ret-11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-11/ret-11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-11.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-11/ret-11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-11.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-11/ret-11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-12/ret-12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-12.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-12/ret-12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-12/ret-12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-12/ret-12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-12.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-12/ret-12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-12.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-12/ret-12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-13/ret-13.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-13.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-13/ret-13.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-13/ret-13.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-13.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-13/ret-13.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-13.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-13/ret-13.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-13.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-13/ret-13.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-14/ret-14.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-14.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-14/ret-14.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-14/ret-14.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-14.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-14/ret-14.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-14.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-14/ret-14.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-14.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-14/ret-14.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-15/ret-15.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-15.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-15/ret-15.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-15/ret-15.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-15.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-15/ret-15.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-15.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-15/ret-15.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-15.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-15/ret-15.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-16/ret-16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-16.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-16/ret-16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-16/ret-16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-16.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-16/ret-16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-16.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-16/ret-16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-16.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-16/ret-16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-17/ret-17.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-17.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-17/ret-17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-17/ret-17.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-17.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-17/ret-17.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-17.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-17/ret-17.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-17.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-17/ret-17.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-18/ret-18.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-18.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-18/ret-18.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-18/ret-18.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-18.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-18/ret-18.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-18.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-18/ret-18.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-18.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-18/ret-18.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-19/ret-19.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/flwor/ret-19.aql
rename to asterix-app/src/test/resources/runtimets/queries/flwor/ret-19/ret-19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-19/ret-19.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-19.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-19/ret-19.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/flwor/ret-19.aql b/asterix-app/src/test/resources/runtimets/queries/flwor/ret-19/ret-19.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/flwor/ret-19.aql
copy to asterix-app/src/test/resources/runtimets/queries/flwor/ret-19/ret-19.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1/dblp-1_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1/dblp-1_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1/dblp-1_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_1/dblp-1_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2/dblp-1_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2/dblp-1_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2/dblp-1_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-1_2/dblp-1_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2/dblp-2.2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2/dblp-2.2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2/dblp-2.2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2.2/dblp-2.2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1/dblp-2_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1/dblp-2_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1/dblp-2_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_1/dblp-2_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2/dblp-2_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2/dblp-2_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2/dblp-2_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_2/dblp-2_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3/dblp-2_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3/dblp-2_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3/dblp-2_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_3/dblp-2_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4/dblp-2_4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4/dblp-2_4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4/dblp-2_4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_4/dblp-2_4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5/dblp-2_5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5/dblp-2_5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5/dblp-2_5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-2_5/dblp-2_5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1/dblp-3_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1/dblp-3_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2.aql b/asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02/hdfs_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02/hdfs_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02/hdfs_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02/hdfs_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02/hdfs_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_02/hdfs_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03/hdfs_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03/hdfs_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03/hdfs_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03/hdfs_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03/hdfs_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/hdfs/hdfs_03/hdfs_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs/issue_245_hdfs.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs.aql
rename to asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs/issue_245_hdfs.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs/issue_245_hdfs.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs.aql
copy to asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs/issue_245_hdfs.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs/issue_245_hdfs.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs.aql
copy to asterix-app/src/test/resources/runtimets/queries/hdfs/issue_245_hdfs/issue_245_hdfs.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5.aql
rename to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5.aql
copy to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6.aql
rename to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6.aql
copy to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6.aql
copy to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7.aql
rename to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7.aql
copy to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7.aql b/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7.aql
copy to asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join/btree-primary-equi-join.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join/btree-primary-equi-join.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join/btree-primary-equi-join.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-join/btree-primary-equi-join/btree-primary-equi-join.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join/btree-secondary-equi-join.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join/btree-secondary-equi-join.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join/btree-secondary-equi-join.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-join/btree-secondary-equi-join/btree-secondary-equi-join.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point.aql b/asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key/btree-index-composite-key.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key/btree-index-composite-key.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable/cust-index-age-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/cust-index-age-nullable/cust-index-age-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains/inverted-index-word-contains.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-contains/inverted-index-word-contains.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open/orders-index-custkey-open.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey-open/orders-index-custkey-open.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey/orders-index-custkey.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey/orders-index-custkey.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey/orders-index-custkey.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/orders-index-custkey/orders-index-custkey.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open/range-search-open.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open/range-search-open.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open/range-search-open.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open/range-search-open.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open/range-search-open.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/range-search-open/range-search-open.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search/range-search.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/range-search.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/range-search/range-search.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search/range-search.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/range-search.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/range-search/range-search.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/range-search/range-search.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/range-search.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/range-search/range-search.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index/rtree-secondary-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/index-selection/rtree-secondary-index/rtree-secondary-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance/ngram-edit-distance.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance/ngram-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance/ngram-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-edit-distance/ngram-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard/ngram-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard/ngram-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard/ngram-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ngram-jaccard/ngram-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance/olist-edit-distance.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance/olist-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance/olist-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-edit-distance/olist-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard/olist-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard/olist-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard/olist-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/olist-jaccard/olist-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard/ulist-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard/ulist-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard/ulist-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/ulist-jaccard/ulist-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline/word-jaccard-inline.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline/word-jaccard-inline.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline/word-jaccard-inline.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard-inline/word-jaccard-inline.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard/word-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard/word-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard/word-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard/word-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard/word-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/inverted-index-join/word-jaccard/word-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/len_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/en_01/en_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/len_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/en_01/en_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/len_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/en_01/en_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/len_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/en_01/en_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/len_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/en_01/en_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/len_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/en_01/en_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/len_null_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/en_null_01/en_null_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/len_null_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/en_null_01/en_null_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/len_null_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/en_null_01/en_null_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/len_null_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/en_null_01/en_null_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/len_null_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/en_null_01/en_null_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/len_null_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/en_null_01/en_null_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/get-item_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/get-item_01/get-item_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/get-item_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/get-item_01/get-item_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/get-item_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/get-item_01/get-item_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/get-item_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/get-item_01/get-item_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/get-item_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/get-item_01/get-item_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/get-item_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/get-item_01/get-item_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_01/istify_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/listify_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/istify_01/istify_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_01/istify_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/listify_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/istify_01/istify_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_01/istify_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/listify_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/istify_01/istify_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_02/istify_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/listify_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/istify_02/istify_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_02/istify_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/listify_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/istify_02/istify_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_02/istify_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/listify_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/istify_02/istify_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_03/istify_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/listify_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/istify_03/istify_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_03/istify_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/listify_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/istify_03/istify_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/listify_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/istify_03/istify_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/listify_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/istify_03/istify_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/any-collection-member_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/ny-collection-member_01/ny-collection-member_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/any-collection-member_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/ny-collection-member_01/ny-collection-member_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/any-collection-member_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/ny-collection-member_01/ny-collection-member_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/any-collection-member_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ny-collection-member_01/ny-collection-member_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/any-collection-member_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/ny-collection-member_01/ny-collection-member_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/any-collection-member_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ny-collection-member_01/ny-collection-member_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01/ordered-list-constructor_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01/ordered-list-constructor_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01/ordered-list-constructor_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01/ordered-list-constructor_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01/ordered-list-constructor_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_01/ordered-list-constructor_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02/ordered-list-constructor_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02/ordered-list-constructor_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02/ordered-list-constructor_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02/ordered-list-constructor_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02/ordered-list-constructor_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_02/ordered-list-constructor_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03/ordered-list-constructor_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03/ordered-list-constructor_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03/ordered-list-constructor_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03/ordered-list-constructor_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03/ordered-list-constructor_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/ordered-list-constructor_03/ordered-list-constructor_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01/scan-collection_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01/scan-collection_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01/scan-collection_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01/scan-collection_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01/scan-collection_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/scan-collection_01/scan-collection_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/union_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/union_01/union_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/union_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/union_01/union_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/union_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/union_01/union_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/union_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/union_01/union_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/union_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/union_01/union_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/union_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/union_01/union_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/union_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/union_02/union_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/union_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/union_02/union_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/union_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/union_02/union_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/union_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/union_02/union_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/union_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/union_02/union_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/union_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/union_02/union_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01/unordered-list-constructor_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01/unordered-list-constructor_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01/unordered-list-constructor_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01/unordered-list-constructor_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01/unordered-list-constructor_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_01/unordered-list-constructor_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02/unordered-list-constructor_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02/unordered-list-constructor_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02/unordered-list-constructor_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02/unordered-list-constructor_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02/unordered-list-constructor_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_02/unordered-list-constructor_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03/unordered-list-constructor_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03/unordered-list-constructor_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03/unordered-list-constructor_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03/unordered-list-constructor_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03/unordered-list-constructor_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/list/unordered-list-constructor_03/unordered-list-constructor_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/load/issue14_query.aql b/asterix-app/src/test/resources/runtimets/queries/load/issue14_query/issue14_query.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/load/issue14_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/load/issue14_query/issue14_query.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/load/issue14_query.aql b/asterix-app/src/test/resources/runtimets/queries/load/issue14_query/issue14_query.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/load/issue14_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/load/issue14_query/issue14_query.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/load/issue14_query.aql b/asterix-app/src/test/resources/runtimets/queries/load/issue14_query/issue14_query.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/load/issue14_query.aql
rename to asterix-app/src/test/resources/runtimets/queries/load/issue14_query/issue14_query.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/float_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/float_01/float_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/float_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/float_01/float_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/float_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/float_01/float_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/float_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/float_01/float_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/float_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/float_01/float_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/float_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/float_01/float_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count.aql b/asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count.aql b/asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count/groupby-orderby-count.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count/groupby-orderby-count.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count.aql b/asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count/groupby-orderby-count.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/groupby-orderby-count/groupby-orderby-count.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01/ifthenelse_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01/ifthenelse_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01/ifthenelse_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01/ifthenelse_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01/ifthenelse_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/ifthenelse_01/ifthenelse_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/is-null_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/is-null_01/is-null_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/is-null_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/is-null_01/is-null_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/is-null_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/is-null_01/is-null_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/is-null_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/is-null_01/is-null_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/is-null_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/is-null_01/is-null_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/is-null_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/is-null_01/is-null_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01/nested-loop-join_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01/nested-loop-join_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01/nested-loop-join_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/nested-loop-join_01/nested-loop-join_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field.aql b/asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field.aql b/asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field.aql b/asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/range_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/range_01/range_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/range_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/range_01/range_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/range_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/range_01/range_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/range_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/range_01/range_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/range_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/range_01/range_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/range_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/range_01/range_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/tid_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/tid_01/tid_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/tid_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/tid_01/tid_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/tid_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/tid_01/tid_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/tid_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/tid_01/tid_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/tid_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/tid_01/tid_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/tid_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/tid_01/tid_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/year_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/year_01/year_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/misc/year_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/misc/year_01/year_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/year_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/year_01/year_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/year_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/year_01/year_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/misc/year_01.aql b/asterix-app/src/test/resources/runtimets/queries/misc/year_01/year_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/misc/year_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/misc/year_01/year_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord.aql b/asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord/nestrecord.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord.aql
rename to asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord/nestrecord.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord.aql b/asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord/nestrecord.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord.aql
copy to asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord/nestrecord.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord.aql b/asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord/nestrecord.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord.aql
copy to asterix-app/src/test/resources/runtimets/queries/nestrecords/nestrecord/nestrecord.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs0/bs0.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/abs0.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/bs0/bs0.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs0/bs0.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs0/bs0.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs0/bs0.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs0/bs0.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs1/bs1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/abs1.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/bs1/bs1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs1/bs1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs1/bs1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs1/bs1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs1/bs1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs2/bs2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/abs2.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/bs2/bs2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs2/bs2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs2/bs2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs2/bs2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs2/bs2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs3/bs3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/abs3.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/bs3/bs3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs3/bs3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs3/bs3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs3/bs3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs3/bs3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs4/bs4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/abs4.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/bs4/bs4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs4/bs4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs4/bs4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/abs4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/bs4/bs4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/abs4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/bs4/bs4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0/ceiling0.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0/ceiling0.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0/ceiling0.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0/ceiling0.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0/ceiling0.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling0/ceiling0.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1/ceiling1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1/ceiling1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1/ceiling1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1/ceiling1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1/ceiling1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling1/ceiling1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2/ceiling2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2/ceiling2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2/ceiling2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2/ceiling2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2/ceiling2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling2/ceiling2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3/ceiling3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3/ceiling3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3/ceiling3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3/ceiling3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3/ceiling3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling3/ceiling3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4/ceiling4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4/ceiling4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4/ceiling4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4/ceiling4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4/ceiling4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/ceiling4/ceiling4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_double/dd_double.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/add_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/dd_double/dd_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_double/dd_double.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_double/dd_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_double/dd_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_double/dd_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_float/dd_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/add_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/dd_float/dd_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_float/dd_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_float/dd_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_float/dd_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_float/dd_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int16/dd_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/add_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int16/dd_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int16/dd_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int16/dd_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int16/dd_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int16/dd_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int32/dd_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/add_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int32/dd_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int32/dd_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int32/dd_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int32/dd_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int32/dd_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int64/dd_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/add_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int64/dd_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int64/dd_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int64/dd_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int64/dd_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int64/dd_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int8/dd_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/add_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int8/dd_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int8/dd_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int8/dd_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/add_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/dd_int8/dd_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/add_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/dd_int8/dd_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_double/divide_double.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_double/divide_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_double/divide_double.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/divide_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/divide_double/divide_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_double/divide_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_double/divide_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_float/divide_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/divide_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/divide_float/divide_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_float/divide_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_float/divide_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_float/divide_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_float/divide_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16/divide_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16/divide_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16/divide_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16/divide_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16/divide_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int16/divide_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32/divide_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32/divide_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32/divide_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32/divide_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32/divide_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int32/divide_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64/divide_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64/divide_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64/divide_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64/divide_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64/divide_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int64/divide_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8/divide_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8/divide_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8/divide_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8/divide_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8/divide_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/divide_int8/divide_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor0/floor0.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/floor0.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/floor0/floor0.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor0/floor0.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor0/floor0.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor0/floor0.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor0/floor0.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor1/floor1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/floor1.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/floor1/floor1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor1/floor1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor1/floor1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor1/floor1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor1/floor1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor2/floor2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/floor2.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/floor2/floor2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor2/floor2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor2/floor2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor2/floor2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor2/floor2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor3/floor3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/floor3.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/floor3/floor3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor3/floor3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor3/floor3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor3/floor3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor3/floor3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor4/floor4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/floor4.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/floor4/floor4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor4/floor4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor4/floor4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/floor4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/floor4/floor4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/floor4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/floor4/floor4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double/multiply_double.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double/multiply_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double/multiply_double.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double/multiply_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double/multiply_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_double/multiply_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float/multiply_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float/multiply_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float/multiply_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float/multiply_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float/multiply_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_float/multiply_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16/multiply_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16/multiply_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16/multiply_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16/multiply_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16/multiply_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int16/multiply_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32/multiply_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32/multiply_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32/multiply_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32/multiply_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32/multiply_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int32/multiply_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64/multiply_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64/multiply_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64/multiply_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64/multiply_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64/multiply_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int64/multiply_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8/multiply_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8/multiply_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8/multiply_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8/multiply_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8/multiply_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/multiply_int8/multiply_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0/round-half-to-even0.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0/round-half-to-even0.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0/round-half-to-even0.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0/round-half-to-even0.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0/round-half-to-even0.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even0/round-half-to-even0.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1/round-half-to-even1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1/round-half-to-even1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1/round-half-to-even1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1/round-half-to-even1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1/round-half-to-even1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even1/round-half-to-even1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2/round-half-to-even2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2/round-half-to-even2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2/round-half-to-even2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2/round-half-to-even2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2/round-half-to-even2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even2/round-half-to-even2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20/round-half-to-even20.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20/round-half-to-even20.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20/round-half-to-even20.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20/round-half-to-even20.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20/round-half-to-even20.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even20/round-half-to-even20.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21/round-half-to-even21.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21/round-half-to-even21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21/round-half-to-even21.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21/round-half-to-even21.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21/round-half-to-even21.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even21/round-half-to-even21.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22/round-half-to-even22.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22/round-half-to-even22.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22/round-half-to-even22.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22/round-half-to-even22.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22/round-half-to-even22.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even22/round-half-to-even22.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23/round-half-to-even23.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23/round-half-to-even23.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23/round-half-to-even23.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23/round-half-to-even23.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23/round-half-to-even23.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even23/round-half-to-even23.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24/round-half-to-even24.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24/round-half-to-even24.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24/round-half-to-even24.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24/round-half-to-even24.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24/round-half-to-even24.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even24/round-half-to-even24.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3/round-half-to-even3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3/round-half-to-even3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3/round-half-to-even3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3/round-half-to-even3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3/round-half-to-even3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even3/round-half-to-even3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4/round-half-to-even4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4/round-half-to-even4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4/round-half-to-even4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4/round-half-to-even4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4/round-half-to-even4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even4/round-half-to-even4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5/round-half-to-even5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5/round-half-to-even5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5/round-half-to-even5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5/round-half-to-even5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5/round-half-to-even5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round-half-to-even5/round-half-to-even5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round0/round0.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round0.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round0/round0.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round0/round0.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round0/round0.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round0.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round0/round0.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round0.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round0/round0.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round1/round1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round1.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round1/round1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round1/round1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round1/round1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round1.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round1/round1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round1.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round1/round1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round2/round2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round2.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round2/round2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round2/round2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round2/round2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round2.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round2/round2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round2.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round2/round2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round3/round3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round3.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round3/round3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round3/round3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round3/round3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round3.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round3/round3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round3.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round3/round3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round4/round4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/round4.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/round4/round4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round4/round4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round4/round4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/round4.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/round4/round4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/round4.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/round4/round4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double/subtract_double.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double/subtract_double.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double/subtract_double.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double/subtract_double.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double/subtract_double.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_double/subtract_double.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float/subtract_float.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float/subtract_float.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float/subtract_float.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float/subtract_float.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float/subtract_float.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_float/subtract_float.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16/subtract_int16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16/subtract_int16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16/subtract_int16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16/subtract_int16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16/subtract_int16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int16/subtract_int16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32/subtract_int32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32/subtract_int32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32/subtract_int32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32/subtract_int32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32/subtract_int32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int32/subtract_int32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64/subtract_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64/subtract_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64/subtract_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64/subtract_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64/subtract_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int64/subtract_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8/subtract_int8.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8/subtract_int8.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8/subtract_int8.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8/subtract_int8.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8/subtract_int8.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/subtract_int8/subtract_int8.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01/unary-minus_double_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01/unary-minus_double_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01/unary-minus_double_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01/unary-minus_double_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01/unary-minus_double_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_01/unary-minus_double_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02/unary-minus_double_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02/unary-minus_double_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02/unary-minus_double_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02/unary-minus_double_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02/unary-minus_double_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_double_02/unary-minus_double_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01/unary-minus_float_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01/unary-minus_float_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01/unary-minus_float_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01/unary-minus_float_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01/unary-minus_float_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_01/unary-minus_float_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02/unary-minus_float_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02/unary-minus_float_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02/unary-minus_float_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02/unary-minus_float_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02/unary-minus_float_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_float_02/unary-minus_float_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01/unary-minus_int_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01/unary-minus_int_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01/unary-minus_int_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01/unary-minus_int_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01/unary-minus_int_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_01/unary-minus_int_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02/unary-minus_int_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02/unary-minus_int_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02/unary-minus_int_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02/unary-minus_int_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02/unary-minus_int_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_int_02/unary-minus_int_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_null.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_nu/unary-minus_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_nu/unary-minus_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_null.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_nu/unary-minus_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_nu/unary-minus_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_null.aql b/asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_nu/unary-minus_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/numeric/unary-minus_nu/unary-minus_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-optional.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-option/c2c-w-option.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-optional.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-option/c2c-w-option.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-optional.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-option/c2c-w-option.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-optional.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-option/c2c-w-option.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-optional.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-option/c2c-w-option.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-optional.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-w-option/c2c-w-option.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-optional.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-option/c2c-wo-option.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-optional.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-option/c2c-wo-option.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-optional.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-option/c2c-wo-option.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-optional.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-option/c2c-wo-option.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-optional.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-option/c2c-wo-option.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-optional.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c-wo-option/c2c-wo-option.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c/c2c.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c/c2c.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c/c2c.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c/c2c.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/c2c/c2c.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/c2c.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/c2c/c2c.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01/heterog-list-ordered01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01/heterog-list-ordered01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01/heterog-list-ordered01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list-ordered01/heterog-list-ordered01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01/heterog-list01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01/heterog-list01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01/heterog-list01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01/heterog-list01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01/heterog-list01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list01/heterog-list01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02/heterog-list02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02/heterog-list02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02/heterog-list02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02/heterog-list02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02/heterog-list02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list02/heterog-list02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03/heterog-list03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03/heterog-list03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03/heterog-list03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03/heterog-list03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03/heterog-list03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/heterog-list03/heterog-list03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01/open-closed-01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01/open-closed-01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01/open-closed-01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01/open-closed-01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01/open-closed-01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-01/open-closed-01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12/open-closed-12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12/open-closed-12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12/open-closed-12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12/open-closed-12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12/open-closed-12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-12/open-closed-12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14/open-closed-14.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14/open-closed-14.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14/open-closed-14.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14/open-closed-14.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14/open-closed-14.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-14/open-closed-14.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15/open-closed-15.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15/open-closed-15.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15/open-closed-15.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15/open-closed-15.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15/open-closed-15.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-15/open-closed-15.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16/open-closed-16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16/open-closed-16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16/open-closed-16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16/open-closed-16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16/open-closed-16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-16/open-closed-16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17/open-closed-17.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17/open-closed-17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17/open-closed-17.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17/open-closed-17.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17/open-closed-17.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-17/open-closed-17.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19/open-closed-19.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19/open-closed-19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19/open-closed-19.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19/open-closed-19.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19/open-closed-19.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-19/open-closed-19.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20/open-closed-20.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20/open-closed-20.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20/open-closed-20.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20/open-closed-20.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20/open-closed-20.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-20/open-closed-20.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21/open-closed-21.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21/open-closed-21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21/open-closed-21.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21/open-closed-21.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21/open-closed-21.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-21/open-closed-21.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22/open-closed-22.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22/open-closed-22.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22/open-closed-22.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22/open-closed-22.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22/open-closed-22.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-22/open-closed-22.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24/open-closed-24.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24/open-closed-24.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24/open-closed-24.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24/open-closed-24.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24/open-closed-24.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-24/open-closed-24.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25/open-closed-25.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25/open-closed-25.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25/open-closed-25.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25/open-closed-25.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25/open-closed-25.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-25/open-closed-25.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26/open-closed-26.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26/open-closed-26.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26/open-closed-26.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26/open-closed-26.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26/open-closed-26.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-26/open-closed-26.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28/open-closed-28.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28/open-closed-28.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28/open-closed-28.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28/open-closed-28.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28/open-closed-28.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-28/open-closed-28.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29/open-closed-29.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29/open-closed-29.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29/open-closed-29.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29/open-closed-29.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29/open-closed-29.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-29/open-closed-29.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30/open-closed-30.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30/open-closed-30.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30/open-closed-30.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30/open-closed-30.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30/open-closed-30.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-30/open-closed-30.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31/open-closed-31.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31/open-closed-31.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31/open-closed-31.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31/open-closed-31.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31/open-closed-31.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-31/open-closed-31.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32/open-closed-32.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32/open-closed-32.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32/open-closed-32.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32/open-closed-32.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32/open-closed-32.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-32/open-closed-32.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33/open-closed-33.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33/open-closed-33.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33/open-closed-33.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33/open-closed-33.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33/open-closed-33.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-33/open-closed-33.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue134.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue134/uery-issue134.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue134.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue134/uery-issue134.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue134.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue134/uery-issue134.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue134.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue134/uery-issue134.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue134.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue134/uery-issue134.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue134.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue134/uery-issue134.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue166.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue166/uery-issue166.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue166.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue166/uery-issue166.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue166.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue166/uery-issue166.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue166.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue166/uery-issue166.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue166.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue166/uery-issue166.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue166.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue166/uery-issue166.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue208/uery-issue208.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue208/uery-issue208.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue208/uery-issue208.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue208/uery-issue208.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue208/uery-issue208.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue208/uery-issue208.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue236/uery-issue236.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue236/uery-issue236.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue236/uery-issue236.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue236/uery-issue236.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue236/uery-issue236.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue236/uery-issue236.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue29.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue29/uery-issue29.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue29.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue29/uery-issue29.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue29.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue29/uery-issue29.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue29.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue29/uery-issue29.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue29.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue29/uery-issue29.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue29.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue29/uery-issue29.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55-1.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55-1/uery-issue55-1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55-1.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55-1/uery-issue55-1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55-1.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55-1/uery-issue55-1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55-1/uery-issue55-1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55-1.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55-1/uery-issue55-1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55-1/uery-issue55-1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55/uery-issue55.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55/uery-issue55.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55/uery-issue55.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55/uery-issue55.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55/uery-issue55.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue55.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-issue55/uery-issue55.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-propos/uery-propos.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-propos/uery-propos.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-propos/uery-propos.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-propos/uery-propos.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-propos/uery-propos.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-propos/uery-propos.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal02.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-proposal02/uery-proposal02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal02.aql
rename to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-proposal02/uery-proposal02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal02.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-proposal02/uery-proposal02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal02.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-proposal02/uery-proposal02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal02.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/uery-proposal02/uery-proposal02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/open-closed/query-proposal02.aql
copy to asterix-app/src/test/resources/runtimets/queries/open-closed/uery-proposal02/uery-proposal02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01/everysat_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01/everysat_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01/everysat_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01/everysat_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01/everysat_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_01/everysat_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02/everysat_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02/everysat_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02/everysat_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02/everysat_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02/everysat_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02/everysat_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03/everysat_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03/everysat_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03/everysat_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03/everysat_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03/everysat_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03/everysat_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04/everysat_04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04/everysat_04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04/everysat_04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04/everysat_04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04/everysat_04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04/everysat_04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01/somesat_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01/somesat_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01/somesat_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01/somesat_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01/somesat_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_01/somesat_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02/somesat_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02/somesat_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02/somesat_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02/somesat_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02/somesat_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_02/somesat_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03/somesat_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03/somesat_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03/somesat_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03/somesat_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03/somesat_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03/somesat_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04/somesat_04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04/somesat_04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04/somesat_04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04/somesat_04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04/somesat_04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04/somesat_04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05/somesat_05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05/somesat_05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05/somesat_05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05/somesat_05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05/somesat_05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05/somesat_05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06/somesat_06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql
rename to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06/somesat_06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06/somesat_06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06/somesat_06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06/somesat_06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql
copy to asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06/somesat_06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03.aql b/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/expFieldName.aql b/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/expFieldName.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/expFieldName.aql b/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/expFieldName.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/expFieldName.aql b/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/expFieldName.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field.aql b/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field.aql b/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field.aql b/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02.aql b/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/10.aql b/asterix-app/src/test/resources/runtimets/queries/scan/10/10.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/10.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/10/10.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/10.aql b/asterix-app/src/test/resources/runtimets/queries/scan/10/10.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/10.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/10/10.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/10.aql b/asterix-app/src/test/resources/runtimets/queries/scan/10/10.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/10.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/10/10.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/20.aql b/asterix-app/src/test/resources/runtimets/queries/scan/20/20.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/20.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/20/20.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/20.aql b/asterix-app/src/test/resources/runtimets/queries/scan/20/20.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/20.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/20/20.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/20.aql b/asterix-app/src/test/resources/runtimets/queries/scan/20/20.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/20.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/20/20.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/30.aql b/asterix-app/src/test/resources/runtimets/queries/scan/30/30.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/30.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/30/30.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/30.aql b/asterix-app/src/test/resources/runtimets/queries/scan/30/30.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/30.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/30/30.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/30.aql b/asterix-app/src/test/resources/runtimets/queries/scan/30/30.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/30.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/30/30.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1.aql b/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1/issue238_query_1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1/issue238_query_1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1.aql b/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1/issue238_query_1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1/issue238_query_1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1.aql b/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1/issue238_query_1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_1/issue238_query_1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2.aql b/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2/issue238_query_2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2/issue238_query_2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2.aql b/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2/issue238_query_2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2/issue238_query_2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2.aql b/asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2/issue238_query_2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/issue238_query_2/issue238_query_2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01/numeric_types_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01/numeric_types_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01/numeric_types_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01/numeric_types_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01/numeric_types_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/numeric_types_01/numeric_types_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01/spatial_types_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01/spatial_types_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01/spatial_types_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01/spatial_types_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01/spatial_types_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_01/spatial_types_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02.aql b/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02/spatial_types_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02/spatial_types_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02.aql b/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02/spatial_types_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02/spatial_types_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02.aql b/asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02/spatial_types_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/spatial_types_02/spatial_types_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01/temp_types_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01/temp_types_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01/temp_types_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01/temp_types_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01/temp_types_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/temp_types_01/temp_types_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02.aql b/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02/temp_types_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02/temp_types_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02.aql b/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02/temp_types_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02/temp_types_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02.aql b/asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02/temp_types_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/temp_types_02/temp_types_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/alltypes_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/types_01/types_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/scan/alltypes_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/scan/types_01/types_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/alltypes_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/types_01/types_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/alltypes_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/types_01/types_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/scan/alltypes_01.aql b/asterix-app/src/test/resources/runtimets/queries/scan/types_01/types_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/scan/alltypes_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/scan/types_01/types_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable.aql
rename to asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable.aql
copy to asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter.aql
rename to asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter.aql
copy to asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter.aql
copy to asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1.aql
rename to asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1.aql
copy to asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1.aql
copy to asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints/edit-distance-check_ints.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints/edit-distance-check_ints.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints/edit-distance-check_ints.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints/edit-distance-check_ints.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints/edit-distance-check_ints.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_ints/edit-distance-check_ints.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings/edit-distance-check_strings.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings/edit-distance-check_strings.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings/edit-distance-check_strings.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings/edit-distance-check_strings.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings/edit-distance-check_strings.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-check_strings/edit-distance-check_strings.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints/edit-distance_ints.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints/edit-distance_ints.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints/edit-distance_ints.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints/edit-distance_ints.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints/edit-distance_ints.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_ints/edit-distance_ints.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings/edit-distance_strings.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings/edit-distance_strings.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings/edit-distance_strings.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings/edit-distance_strings.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings/edit-distance_strings.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/edit-distance_strings/edit-distance_strings.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard/prefix-len-jaccard.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard/prefix-len-jaccard.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard/prefix-len-jaccard.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard/prefix-len-jaccard.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard/prefix-len-jaccard.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/prefix-len-jaccard/prefix-len-jaccard.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints/similarity-jaccard_ints.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints/similarity-jaccard_ints.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints/similarity-jaccard_ints.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints/similarity-jaccard_ints.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints/similarity-jaccard_ints.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_ints/similarity-jaccard_ints.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query/similarity-jaccard_query.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query/similarity-jaccard_query.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query/similarity-jaccard_query.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_query/similarity-jaccard_query.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings/similarity-jaccard_strings.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings.aql
rename to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings/similarity-jaccard_strings.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings/similarity-jaccard_strings.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings/similarity-jaccard_strings.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings.aql b/asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings/similarity-jaccard_strings.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings.aql
copy to asterix-app/src/test/resources/runtimets/queries/similarity/similarity-jaccard_strings/similarity-jaccard_strings.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-circle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-line.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-line.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-line.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-line.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-line.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-line.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-polygon.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-polygon.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-polygon.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-rectangle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line-intersect-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/line_accessor.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/line_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/line_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-area.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/spatial/spatial-area.aql
rename to asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-area.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/spatial-area.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-area.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/spatial/spatial-area.aql
copy to asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1.aql b/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1/codepoint-to-string1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1/codepoint-to-string1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1.aql b/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1/codepoint-to-string1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1/codepoint-to-string1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1.aql b/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1/codepoint-to-string1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string1/codepoint-to-string1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2.aql b/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2/codepoint-to-string2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2/codepoint-to-string2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2.aql b/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2/codepoint-to-string2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2/codepoint-to-string2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2.aql b/asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2/codepoint-to-string2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/codepoint-to-string2/codepoint-to-string2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/concat_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/concat_01/concat_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/concat_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/concat_01/concat_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/concat_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/concat_01/concat_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/concat_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/concat_01/concat_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/concat_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/concat_01/concat_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/concat_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/concat_01/concat_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/concat_02.aql b/asterix-app/src/test/resources/runtimets/queries/string/concat_02/concat_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/concat_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/concat_02/concat_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/concat_02.aql b/asterix-app/src/test/resources/runtimets/queries/string/concat_02/concat_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/concat_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/concat_02/concat_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/concat_02.aql b/asterix-app/src/test/resources/runtimets/queries/string/concat_02/concat_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/concat_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/concat_02/concat_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/contains_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/contains_01/contains_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/contains_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/contains_01/contains_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/contains_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/contains_01/contains_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/contains_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/contains_01/contains_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/contains_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/contains_01/contains_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/contains_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/contains_01/contains_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr01.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr01/cpttostr01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/cpttostr01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/cpttostr01/cpttostr01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr01.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr01/cpttostr01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/cpttostr01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/cpttostr01/cpttostr01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr01.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr01/cpttostr01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/cpttostr01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/cpttostr01/cpttostr01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr02.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr02/cpttostr02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/cpttostr02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/cpttostr02/cpttostr02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr02.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr02/cpttostr02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/cpttostr02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/cpttostr02/cpttostr02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr02.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr02/cpttostr02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/cpttostr02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/cpttostr02/cpttostr02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr04.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr04/cpttostr04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/cpttostr04.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/cpttostr04/cpttostr04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr04.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr04/cpttostr04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/cpttostr04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/cpttostr04/cpttostr04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/cpttostr04.aql b/asterix-app/src/test/resources/runtimets/queries/string/cpttostr04/cpttostr04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/cpttostr04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/cpttostr04/cpttostr04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with1.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with1/end-with1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/end-with1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/end-with1/end-with1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with1.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with1/end-with1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with1/end-with1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with1.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with1/end-with1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with1/end-with1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with2.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with2/end-with2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/end-with2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/end-with2/end-with2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with2.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with2/end-with2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with2/end-with2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with2.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with2/end-with2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with2/end-with2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with3.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with3/end-with3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/end-with3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/end-with3/end-with3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with3.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with3/end-with3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with3/end-with3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with3.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with3/end-with3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with3/end-with3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with4.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with4/end-with4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/end-with4.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/end-with4/end-with4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with4.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with4/end-with4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with4/end-with4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with4.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with4/end-with4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with4/end-with4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with5.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with5/end-with5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/end-with5.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/end-with5/end-with5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with5.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with5/end-with5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with5.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with5/end-with5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/end-with5.aql b/asterix-app/src/test/resources/runtimets/queries/string/end-with5/end-with5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/end-with5.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/end-with5/end-with5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/ends-with_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ends-with_01/ends-with_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/ends-with_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/ends-with_01/ends-with_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/ends-with_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ends-with_01/ends-with_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/ends-with_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ends-with_01/ends-with_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/ends-with_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ends-with_01/ends-with_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/ends-with_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ends-with_01/ends-with_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/endwith02.aql b/asterix-app/src/test/resources/runtimets/queries/string/endwith02/endwith02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/endwith02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/endwith02/endwith02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/endwith02.aql b/asterix-app/src/test/resources/runtimets/queries/string/endwith02/endwith02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/endwith02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/endwith02/endwith02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/endwith02.aql b/asterix-app/src/test/resources/runtimets/queries/string/endwith02/endwith02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/endwith02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/endwith02/endwith02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/endwith03.aql b/asterix-app/src/test/resources/runtimets/queries/string/endwith03/endwith03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/endwith03.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/endwith03/endwith03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/endwith03.aql b/asterix-app/src/test/resources/runtimets/queries/string/endwith03/endwith03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/endwith03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/endwith03/endwith03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/endwith03.aql b/asterix-app/src/test/resources/runtimets/queries/string/endwith03/endwith03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/endwith03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/endwith03/endwith03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/length_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ength_01/ength_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/length_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/ength_01/ength_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/length_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ength_01/ength_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/length_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ength_01/ength_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/length_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ength_01/ength_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/length_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ength_01/ength_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/length_02.aql b/asterix-app/src/test/resources/runtimets/queries/string/ength_02/ength_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/length_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/ength_02/ength_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/length_02.aql b/asterix-app/src/test/resources/runtimets/queries/string/ength_02/ength_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/length_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ength_02/ength_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/length_02.aql b/asterix-app/src/test/resources/runtimets/queries/string/ength_02/ength_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/length_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ength_02/ength_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/like_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ike_01/ike_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/like_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/ike_01/ike_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/like_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ike_01/ike_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/like_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ike_01/ike_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/like_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/ike_01/ike_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/like_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ike_01/ike_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/like_null.aql b/asterix-app/src/test/resources/runtimets/queries/string/ike_nu/ike_nu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/like_null.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/ike_nu/ike_nu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/like_null.aql b/asterix-app/src/test/resources/runtimets/queries/string/ike_nu/ike_nu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/like_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ike_nu/ike_nu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/like_null.aql b/asterix-app/src/test/resources/runtimets/queries/string/ike_nu/ike_nu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/like_null.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/ike_nu/ike_nu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches02.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches02/matches02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches02/matches02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches02.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches02/matches02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches02/matches02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches02.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches02/matches02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches02/matches02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches03.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches03/matches03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches03.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches03/matches03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches03.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches03/matches03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches03/matches03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches03.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches03/matches03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches03/matches03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches04.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches04/matches04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches04.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches04/matches04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches04.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches04/matches04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches04/matches04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches04.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches04/matches04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches04/matches04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches05.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches05/matches05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches05.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches05/matches05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches05.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches05/matches05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches05.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches05/matches05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches05.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches05/matches05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches05.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches05/matches05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches06.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches06/matches06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches06.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches06/matches06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches06.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches06/matches06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches06.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches06/matches06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches06.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches06/matches06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches06.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches06/matches06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches1.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches1/matches1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches1/matches1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches1.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches1/matches1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches1/matches1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches1.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches1/matches1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches1/matches1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches11.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches11/matches11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches11.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches11/matches11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches11.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches11/matches11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches11.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches11/matches11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches11.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches11/matches11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches11.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches11/matches11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches2.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches2/matches2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches2/matches2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches2.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches2/matches2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches2/matches2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches2.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches2/matches2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches2/matches2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches21.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches21/matches21.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches21.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches21/matches21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches21.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches21/matches21.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches21.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches21/matches21.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches21.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches21/matches21.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches21.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches21/matches21.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches22.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches22/matches22.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches22.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches22/matches22.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches22.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches22/matches22.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches22.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches22/matches22.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches22.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches22/matches22.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches22.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches22/matches22.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches23.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches23/matches23.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches23.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches23/matches23.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches23.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches23/matches23.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches23.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches23/matches23.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches23.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches23/matches23.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches23.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches23/matches23.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches3.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches3/matches3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matches3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matches3/matches3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches3.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches3/matches3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches3/matches3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matches3.aql b/asterix-app/src/test/resources/runtimets/queries/string/matches3/matches3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matches3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matches3/matches3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matchesnull.aql b/asterix-app/src/test/resources/runtimets/queries/string/matchesnu/matchesnu.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/matchesnull.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/matchesnu/matchesnu.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matchesnull.aql b/asterix-app/src/test/resources/runtimets/queries/string/matchesnu/matchesnu.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matchesnull.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matchesnu/matchesnu.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/matchesnull.aql b/asterix-app/src/test/resources/runtimets/queries/string/matchesnu/matchesnu.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/matchesnull.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/matchesnu/matchesnu.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/lowercase.aql b/asterix-app/src/test/resources/runtimets/queries/string/owercase/owercase.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/lowercase.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/owercase/owercase.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/lowercase.aql b/asterix-app/src/test/resources/runtimets/queries/string/owercase/owercase.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/lowercase.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/owercase/owercase.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/lowercase.aql b/asterix-app/src/test/resources/runtimets/queries/string/owercase/owercase.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/lowercase.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/owercase/owercase.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace1.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace1/replace1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/replace1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/replace1/replace1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace1.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace1/replace1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace1/replace1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace1.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace1/replace1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace1/replace1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace2.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace2/replace2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/replace2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/replace2/replace2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace2.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace2/replace2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace2/replace2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace2.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace2/replace2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace2/replace2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace21.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace21/replace21.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/replace21.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/replace21/replace21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace21.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace21/replace21.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace21.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace21/replace21.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace21.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace21/replace21.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace21.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace21/replace21.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace22.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace22/replace22.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/replace22.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/replace22/replace22.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace22.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace22/replace22.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace22.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace22/replace22.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace22.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace22/replace22.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace22.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace22/replace22.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace3.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace3/replace3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/replace3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/replace3/replace3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace3.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace3/replace3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace3/replace3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/replace3.aql b/asterix-app/src/test/resources/runtimets/queries/string/replace3/replace3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/replace3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/replace3/replace3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with1.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with1/start-with1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/start-with1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/start-with1/start-with1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with1.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with1/start-with1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with1/start-with1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with1.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with1/start-with1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with1/start-with1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with2.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with2/start-with2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/start-with2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/start-with2/start-with2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with2.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with2/start-with2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with2/start-with2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with2.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with2/start-with2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with2/start-with2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with3.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with3/start-with3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/start-with3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/start-with3/start-with3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with3.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with3/start-with3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with3/start-with3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with3.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with3/start-with3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with3/start-with3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with4.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with4/start-with4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/start-with4.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/start-with4/start-with4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with4.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with4/start-with4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with4/start-with4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with4.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with4/start-with4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with4/start-with4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with5.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with5/start-with5.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/start-with5.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/start-with5/start-with5.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with5.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with5/start-with5.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with5.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with5/start-with5.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/start-with5.aql b/asterix-app/src/test/resources/runtimets/queries/string/start-with5/start-with5.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/start-with5.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/start-with5/start-with5.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/starts-with_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/starts-with_01/starts-with_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/starts-with_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/starts-with_01/starts-with_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/starts-with_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/starts-with_01/starts-with_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/starts-with_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/starts-with_01/starts-with_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/starts-with_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/starts-with_01/starts-with_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/starts-with_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/starts-with_01/starts-with_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/startwith02.aql b/asterix-app/src/test/resources/runtimets/queries/string/startwith02/startwith02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/startwith02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/startwith02/startwith02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/startwith02.aql b/asterix-app/src/test/resources/runtimets/queries/string/startwith02/startwith02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/startwith02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/startwith02/startwith02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/startwith02.aql b/asterix-app/src/test/resources/runtimets/queries/string/startwith02/startwith02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/startwith02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/startwith02/startwith02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/startwith03.aql b/asterix-app/src/test/resources/runtimets/queries/string/startwith03/startwith03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/startwith03.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/startwith03/startwith03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/startwith03.aql b/asterix-app/src/test/resources/runtimets/queries/string/startwith03/startwith03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/startwith03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/startwith03/startwith03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/startwith03.aql b/asterix-app/src/test/resources/runtimets/queries/string/startwith03/startwith03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/startwith03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/startwith03/startwith03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strconcat01.aql b/asterix-app/src/test/resources/runtimets/queries/string/strconcat01/strconcat01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strconcat01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strconcat01/strconcat01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strconcat01.aql b/asterix-app/src/test/resources/runtimets/queries/string/strconcat01/strconcat01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strconcat01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strconcat01/strconcat01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strconcat01.aql b/asterix-app/src/test/resources/runtimets/queries/string/strconcat01/strconcat01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strconcat01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strconcat01/strconcat01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strconcat02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strconcat02/strconcat02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strconcat02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strconcat02/strconcat02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strconcat02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strconcat02/strconcat02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strconcat02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strconcat02/strconcat02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strconcat02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strconcat02/strconcat02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strconcat02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strconcat02/strconcat02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-concat1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-concat1/string-concat1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-concat1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-concat1/string-concat1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-concat1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-concat1/string-concat1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-concat1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-concat1/string-concat1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-concat1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-concat1/string-concat1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-concat1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-concat1/string-concat1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal1/string-equal1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-equal1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-equal1/string-equal1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal1/string-equal1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal1/string-equal1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal1/string-equal1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal1/string-equal1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal2.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal2/string-equal2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-equal2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-equal2/string-equal2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal2.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal2/string-equal2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal2/string-equal2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal2.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal2/string-equal2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal2/string-equal2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal3.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal3/string-equal3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-equal3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-equal3/string-equal3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal3.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal3/string-equal3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal3/string-equal3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal3.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal3/string-equal3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal3/string-equal3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal4.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal4/string-equal4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-equal4.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-equal4/string-equal4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal4.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal4/string-equal4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal4/string-equal4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-equal4.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-equal4/string-equal4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-equal4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-equal4/string-equal4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-join1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-join1/string-join1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-join1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-join1/string-join1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-join1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-join1/string-join1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-join1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-join1/string-join1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-join1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-join1/string-join1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-join1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-join1/string-join1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint/string-to-codepoint.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint/string-to-codepoint.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint/string-to-codepoint.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint/string-to-codepoint.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint/string-to-codepoint.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint/string-to-codepoint.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1/string-to-codepoint1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1/string-to-codepoint1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1/string-to-codepoint1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1/string-to-codepoint1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1.aql b/asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1/string-to-codepoint1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/string-to-codepoint1/string-to-codepoint1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strlen02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strlen02/strlen02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strlen02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strlen02/strlen02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strlen02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strlen02/strlen02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strlen02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strlen02/strlen02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strlen02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strlen02/strlen02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strlen02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strlen02/strlen02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strlen03.aql b/asterix-app/src/test/resources/runtimets/queries/string/strlen03/strlen03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strlen03.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strlen03/strlen03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strlen03.aql b/asterix-app/src/test/resources/runtimets/queries/string/strlen03/strlen03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strlen03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strlen03/strlen03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strlen03.aql b/asterix-app/src/test/resources/runtimets/queries/string/strlen03/strlen03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strlen03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strlen03/strlen03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt01.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt01/strtocpt01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strtocpt01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strtocpt01/strtocpt01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt01.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt01/strtocpt01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strtocpt01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strtocpt01/strtocpt01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt01.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt01/strtocpt01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strtocpt01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strtocpt01/strtocpt01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt02/strtocpt02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strtocpt02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strtocpt02/strtocpt02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt02/strtocpt02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strtocpt02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strtocpt02/strtocpt02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt02.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt02/strtocpt02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strtocpt02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strtocpt02/strtocpt02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt03.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt03/strtocpt03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/strtocpt03.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/strtocpt03/strtocpt03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt03.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt03/strtocpt03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strtocpt03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strtocpt03/strtocpt03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/strtocpt03.aql b/asterix-app/src/test/resources/runtimets/queries/string/strtocpt03/strtocpt03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/strtocpt03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/strtocpt03/strtocpt03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr01.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr01/substr01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substr01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substr01/substr01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr01.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr01/substr01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr01/substr01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr01.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr01/substr01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr01/substr01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr04.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr04/substr04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substr04.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substr04/substr04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr04.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr04/substr04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr04/substr04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr04.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr04/substr04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr04/substr04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr05.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr05/substr05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substr05.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substr05/substr05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr05.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr05/substr05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr05.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr05/substr05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr05.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr05/substr05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr05.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr05/substr05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr06.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr06/substr06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substr06.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substr06/substr06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr06.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr06/substr06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr06.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr06/substr06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substr06.aql b/asterix-app/src/test/resources/runtimets/queries/string/substr06/substr06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substr06.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substr06/substr06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-1/substring-after-1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-after-1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-after-1/substring-after-1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-1/substring-after-1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-1/substring-after-1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-1/substring-after-1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-1/substring-after-1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-2/substring-after-2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-after-2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-after-2/substring-after-2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-2/substring-after-2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-2/substring-after-2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-2/substring-after-2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-2/substring-after-2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-3/substring-after-3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-after-3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-after-3/substring-after-3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-3/substring-after-3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-3/substring-after-3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-3/substring-after-3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-3/substring-after-3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-4.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-4/substring-after-4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-after-4.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-after-4/substring-after-4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-4.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-4/substring-after-4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-4/substring-after-4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-after-4.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-after-4/substring-after-4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-after-4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-after-4/substring-after-4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-1/substring-before-1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-before-1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-before-1/substring-before-1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-1/substring-before-1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-before-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-before-1/substring-before-1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-1/substring-before-1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-before-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-before-1/substring-before-1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-2/substring-before-2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-before-2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-before-2/substring-before-2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-2/substring-before-2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-before-2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-before-2/substring-before-2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-2/substring-before-2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-before-2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-before-2/substring-before-2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-3/substring-before-3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring-before-3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring-before-3/substring-before-3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-3/substring-before-3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-before-3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-before-3/substring-before-3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring-before-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring-before-3/substring-before-3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring-before-3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring-before-3/substring-before-3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-1/substring2-1.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring2-1.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring2-1/substring2-1.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-1/substring2-1.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-1/substring2-1.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-1.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-1/substring2-1.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-1.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-1/substring2-1.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-2/substring2-2.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring2-2.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring2-2/substring2-2.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-2/substring2-2.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-2/substring2-2.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-2.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-2/substring2-2.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-2.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-2/substring2-2.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-3/substring2-3.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring2-3.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring2-3/substring2-3.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-3/substring2-3.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-3/substring2-3.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-3.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-3/substring2-3.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-3.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-3/substring2-3.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-4.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-4/substring2-4.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring2-4.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring2-4/substring2-4.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-4.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-4/substring2-4.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-4/substring2-4.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring2-4.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring2-4/substring2-4.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring2-4.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring2-4/substring2-4.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring_01/substring_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/substring_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/substring_01/substring_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring_01/substring_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring_01/substring_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/substring_01.aql b/asterix-app/src/test/resources/runtimets/queries/string/substring_01/substring_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/substring_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/substring_01/substring_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02/toLowerCase02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02/toLowerCase02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02/toLowerCase02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02/toLowerCase02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02/toLowerCase02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase02/toLowerCase02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03/toLowerCase03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03/toLowerCase03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03/toLowerCase03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03/toLowerCase03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03/toLowerCase03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase03/toLowerCase03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04/toLowerCase04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04.aql
rename to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04/toLowerCase04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04/toLowerCase04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04/toLowerCase04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04.aql b/asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04/toLowerCase04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04.aql
copy to asterix-app/src/test/resources/runtimets/queries/string/toLowerCase04/toLowerCase04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/01.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/01/01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/01.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/01/01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/01.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/01/01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/01.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/01/01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/01.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/01/01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/01.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/01/01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/02.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/02/02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/02.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/02/02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/02.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/02/02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/02.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/02/02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/02.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/02/02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/02.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/02/02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/03.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/03/03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/03.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/03/03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/03.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/03/03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/03.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/03/03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/03.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/03/03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/03.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/03/03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/04.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/04/04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/04.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/04/04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/04.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/04/04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/04.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/04/04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/04.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/04/04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/04.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/04/04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/05.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/05/05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/05.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/05/05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/05.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/05/05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/05.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/05/05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/05.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/05/05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/05.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/05/05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/06.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/06/06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/06.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/06/06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/06.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/06/06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/06.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/06/06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/06.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/06/06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/06.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/06/06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/07.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/07/07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/subset-collection/07.aql
rename to asterix-app/src/test/resources/runtimets/queries/subset-collection/07/07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/07.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/07/07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/07.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/07/07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/subset-collection/07.aql b/asterix-app/src/test/resources/runtimets/queries/subset-collection/07/07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/subset-collection/07.aql
copy to asterix-app/src/test/resources/runtimets/queries/subset-collection/07/07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration.aql b/asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration/calendar_duration.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration/calendar_duration.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration.aql b/asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration/calendar_duration.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration/calendar_duration.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration.aql b/asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration/calendar_duration.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/calendar_duration/calendar_duration.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/accessors.aql b/asterix-app/src/test/resources/runtimets/queries/temp/ccessors/ccessors.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/accessors.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/ccessors/ccessors.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/accessors.aql b/asterix-app/src/test/resources/runtimets/queries/temp/ccessors/ccessors.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/accessors.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/ccessors/ccessors.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/accessors.aql b/asterix-app/src/test/resources/runtimets/queries/temp/ccessors/ccessors.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/accessors.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/ccessors/ccessors.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/date_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/date_functions/date_functions.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/date_functions.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/date_functions/date_functions.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/date_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/date_functions/date_functions.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/date_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/date_functions/date_functions.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/date_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/date_functions/date_functions.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/date_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/date_functions/date_functions.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions/datetime_functions.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions/datetime_functions.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions/datetime_functions.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions/datetime_functions.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions/datetime_functions.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/datetime_functions/datetime_functions.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/adjust_timezone.aql b/asterix-app/src/test/resources/runtimets/queries/temp/djust_timezone/djust_timezone.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/adjust_timezone.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/djust_timezone/djust_timezone.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/adjust_timezone.aql b/asterix-app/src/test/resources/runtimets/queries/temp/djust_timezone/djust_timezone.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/adjust_timezone.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/djust_timezone/djust_timezone.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/adjust_timezone.aql b/asterix-app/src/test/resources/runtimets/queries/temp/djust_timezone/djust_timezone.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/adjust_timezone.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/djust_timezone/djust_timezone.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds.aql b/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds.aql b/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds/insert_from_delimited_ds.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds/insert_from_delimited_ds.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds.aql b/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds/insert_from_delimited_ds.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/insert_from_delimited_ds/insert_from_delimited_ds.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds.aql b/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds/insert_from_ext_ds.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds/insert_from_ext_ds.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds.aql b/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds/insert_from_ext_ds.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds/insert_from_ext_ds.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds.aql b/asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds/insert_from_ext_ds.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/insert_from_ext_ds/insert_from_ext_ds.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/interval_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/interval_functions/interval_functions.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/interval_functions.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/interval_functions/interval_functions.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/interval_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/interval_functions/interval_functions.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/interval_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/interval_functions/interval_functions.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/interval_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/interval_functions/interval_functions.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/interval_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/interval_functions/interval_functions.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/time_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/time_functions/time_functions.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/temp/time_functions.aql
rename to asterix-app/src/test/resources/runtimets/queries/temp/time_functions/time_functions.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/time_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/time_functions/time_functions.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/time_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/time_functions/time_functions.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/temp/time_functions.aql b/asterix-app/src/test/resources/runtimets/queries/temp/time_functions/time_functions.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/temp/time_functions.aql
copy to asterix-app/src/test/resources/runtimets/queries/temp/time_functions/time_functions.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01/gram-tokens_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01/gram-tokens_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01/gram-tokens_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_01/gram-tokens_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02/gram-tokens_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02/gram-tokens_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02/gram-tokens_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/gram-tokens_02/gram-tokens_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01/word-tokens_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01/word-tokens_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01/word-tokens_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01/word-tokens_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01/word-tokens_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_01/word-tokens_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02/word-tokens_02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02.aql
rename to asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02/word-tokens_02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02/word-tokens_02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02/word-tokens_02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02.aql b/asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02/word-tokens_02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02.aql
copy to asterix-app/src/test/resources/runtimets/queries/tokenizers/word-tokens_02/word-tokens_02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item/10_returned_item.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item/10_returned_item.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item/10_returned_item.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item/10_returned_item.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item/10_returned_item.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item/10_returned_item.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item_int64.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item_int64/10_returned_item_int64.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item_int64.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item_int64/10_returned_item_int64.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item_int64.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item_int64/10_returned_item_int64.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item_int64/10_returned_item_int64.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item_int64.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item_int64/10_returned_item_int64.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q10_returned_item_int64.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/10_returned_item_int64/10_returned_item_int64.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q11_important_stock.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/11_important_stock/11_important_stock.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q11_important_stock.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/11_important_stock/11_important_stock.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q11_important_stock.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/11_important_stock/11_important_stock.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q11_important_stock.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/11_important_stock/11_important_stock.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q11_important_stock.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/11_important_stock/11_important_stock.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q11_important_stock.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/11_important_stock/11_important_stock.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q12_shipping.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/12_shipping/12_shipping.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q12_shipping.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/12_shipping/12_shipping.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q12_shipping.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/12_shipping/12_shipping.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q12_shipping.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/12_shipping/12_shipping.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q12_shipping.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/12_shipping/12_shipping.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q12_shipping.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/12_shipping/12_shipping.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q13_customer_distribution.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/13_customer_distribution/13_customer_distribution.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q13_customer_distribution.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/13_customer_distribution/13_customer_distribution.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q13_customer_distribution.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/13_customer_distribution/13_customer_distribution.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q13_customer_distribution.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/13_customer_distribution/13_customer_distribution.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q13_customer_distribution.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/13_customer_distribution/13_customer_distribution.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q13_customer_distribution.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/13_customer_distribution/13_customer_distribution.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q14_promotion_effect.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/14_promotion_effect/14_promotion_effect.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q14_promotion_effect.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/14_promotion_effect/14_promotion_effect.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q14_promotion_effect.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/14_promotion_effect/14_promotion_effect.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q14_promotion_effect.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/14_promotion_effect/14_promotion_effect.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q14_promotion_effect.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/14_promotion_effect/14_promotion_effect.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q14_promotion_effect.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/14_promotion_effect/14_promotion_effect.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q15_top_supplier.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/15_top_supplier/15_top_supplier.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q15_top_supplier.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/15_top_supplier/15_top_supplier.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q15_top_supplier.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/15_top_supplier/15_top_supplier.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q15_top_supplier.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/15_top_supplier/15_top_supplier.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q15_top_supplier.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/15_top_supplier/15_top_supplier.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q15_top_supplier.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/15_top_supplier/15_top_supplier.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q16_parts_supplier_relationship.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/16_parts_supplier_relationship/16_parts_supplier_relationship.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q16_parts_supplier_relationship.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/16_parts_supplier_relationship/16_parts_supplier_relationship.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q16_parts_supplier_relationship.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/16_parts_supplier_relationship/16_parts_supplier_relationship.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q16_parts_supplier_relationship.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/16_parts_supplier_relationship/16_parts_supplier_relationship.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q16_parts_supplier_relationship.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/16_parts_supplier_relationship/16_parts_supplier_relationship.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q16_parts_supplier_relationship.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/16_parts_supplier_relationship/16_parts_supplier_relationship.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q17_small_quantity_order_revenue.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/17_small_quantity_order_revenue/17_small_quantity_order_revenue.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q17_small_quantity_order_revenue.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/17_small_quantity_order_revenue/17_small_quantity_order_revenue.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q17_small_quantity_order_revenue.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/17_small_quantity_order_revenue/17_small_quantity_order_revenue.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q17_small_quantity_order_revenue.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/17_small_quantity_order_revenue/17_small_quantity_order_revenue.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q17_small_quantity_order_revenue.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/17_small_quantity_order_revenue/17_small_quantity_order_revenue.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q17_small_quantity_order_revenue.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/17_small_quantity_order_revenue/17_small_quantity_order_revenue.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q18_large_volume_customer.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/18_large_volume_customer/18_large_volume_customer.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q18_large_volume_customer.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/18_large_volume_customer/18_large_volume_customer.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q18_large_volume_customer.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/18_large_volume_customer/18_large_volume_customer.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q18_large_volume_customer.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/18_large_volume_customer/18_large_volume_customer.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q18_large_volume_customer.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/18_large_volume_customer/18_large_volume_customer.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q18_large_volume_customer.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/18_large_volume_customer/18_large_volume_customer.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q19_discounted_revenue.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/19_discounted_revenue/19_discounted_revenue.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q19_discounted_revenue.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/19_discounted_revenue/19_discounted_revenue.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q19_discounted_revenue.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/19_discounted_revenue/19_discounted_revenue.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q19_discounted_revenue.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/19_discounted_revenue/19_discounted_revenue.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q19_discounted_revenue.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/19_discounted_revenue/19_discounted_revenue.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q19_discounted_revenue.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/19_discounted_revenue/19_discounted_revenue.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q1_pricing_summary_report_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/1_pricing_summary_report_nt/1_pricing_summary_report_nt.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q1_pricing_summary_report_nt.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/1_pricing_summary_report_nt/1_pricing_summary_report_nt.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q1_pricing_summary_report_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/1_pricing_summary_report_nt/1_pricing_summary_report_nt.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q1_pricing_summary_report_nt.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/1_pricing_summary_report_nt/1_pricing_summary_report_nt.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q1_pricing_summary_report_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/1_pricing_summary_report_nt/1_pricing_summary_report_nt.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q1_pricing_summary_report_nt.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/1_pricing_summary_report_nt/1_pricing_summary_report_nt.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q20_potential_part_promotion.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/20_potential_part_promotion/20_potential_part_promotion.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q20_potential_part_promotion.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/20_potential_part_promotion/20_potential_part_promotion.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q20_potential_part_promotion.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/20_potential_part_promotion/20_potential_part_promotion.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q20_potential_part_promotion.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/20_potential_part_promotion/20_potential_part_promotion.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q20_potential_part_promotion.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/20_potential_part_promotion/20_potential_part_promotion.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q20_potential_part_promotion.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/20_potential_part_promotion/20_potential_part_promotion.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q21_suppliers_who_kept_orders_waiting.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/21_suppliers_who_kept_orders_waiting/21_suppliers_who_kept_orders_waiting.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q21_suppliers_who_kept_orders_waiting.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/21_suppliers_who_kept_orders_waiting/21_suppliers_who_kept_orders_waiting.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q21_suppliers_who_kept_orders_waiting.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/21_suppliers_who_kept_orders_waiting/21_suppliers_who_kept_orders_waiting.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q21_suppliers_who_kept_orders_waiting.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/21_suppliers_who_kept_orders_waiting/21_suppliers_who_kept_orders_waiting.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q21_suppliers_who_kept_orders_waiting.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/21_suppliers_who_kept_orders_waiting/21_suppliers_who_kept_orders_waiting.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q21_suppliers_who_kept_orders_waiting.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/21_suppliers_who_kept_orders_waiting/21_suppliers_who_kept_orders_waiting.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q22_global_sales_opportunity.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/22_global_sales_opportunity/22_global_sales_opportunity.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q22_global_sales_opportunity.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/22_global_sales_opportunity/22_global_sales_opportunity.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q22_global_sales_opportunity.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/22_global_sales_opportunity/22_global_sales_opportunity.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q22_global_sales_opportunity.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/22_global_sales_opportunity/22_global_sales_opportunity.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q22_global_sales_opportunity.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/22_global_sales_opportunity/22_global_sales_opportunity.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q22_global_sales_opportunity.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/22_global_sales_opportunity/22_global_sales_opportunity.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q2_minimum_cost_supplier.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/2_minimum_cost_supplier/2_minimum_cost_supplier.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q2_minimum_cost_supplier.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/2_minimum_cost_supplier/2_minimum_cost_supplier.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q2_minimum_cost_supplier.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/2_minimum_cost_supplier/2_minimum_cost_supplier.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q2_minimum_cost_supplier.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/2_minimum_cost_supplier/2_minimum_cost_supplier.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q2_minimum_cost_supplier.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/2_minimum_cost_supplier/2_minimum_cost_supplier.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q2_minimum_cost_supplier.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/2_minimum_cost_supplier/2_minimum_cost_supplier.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q3_shipping_priority_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/3_shipping_priority_nt/3_shipping_priority_nt.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q3_shipping_priority_nt.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/3_shipping_priority_nt/3_shipping_priority_nt.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q3_shipping_priority_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/3_shipping_priority_nt/3_shipping_priority_nt.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q3_shipping_priority_nt.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/3_shipping_priority_nt/3_shipping_priority_nt.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q3_shipping_priority_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/3_shipping_priority_nt/3_shipping_priority_nt.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q3_shipping_priority_nt.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/3_shipping_priority_nt/3_shipping_priority_nt.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q4_order_priority.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/4_order_priority/4_order_priority.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q4_order_priority.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/4_order_priority/4_order_priority.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q4_order_priority.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/4_order_priority/4_order_priority.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q4_order_priority.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/4_order_priority/4_order_priority.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q4_order_priority.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/4_order_priority/4_order_priority.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q4_order_priority.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/4_order_priority/4_order_priority.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q5_local_supplier_volume.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/5_local_supplier_volume/5_local_supplier_volume.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q5_local_supplier_volume.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/5_local_supplier_volume/5_local_supplier_volume.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q5_local_supplier_volume.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/5_local_supplier_volume/5_local_supplier_volume.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q5_local_supplier_volume.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/5_local_supplier_volume/5_local_supplier_volume.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q5_local_supplier_volume.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/5_local_supplier_volume/5_local_supplier_volume.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q5_local_supplier_volume.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/5_local_supplier_volume/5_local_supplier_volume.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/6_forecast_revenue_change/6_forecast_revenue_change.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/6_forecast_revenue_change/6_forecast_revenue_change.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/6_forecast_revenue_change/6_forecast_revenue_change.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/6_forecast_revenue_change/6_forecast_revenue_change.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/6_forecast_revenue_change/6_forecast_revenue_change.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/6_forecast_revenue_change/6_forecast_revenue_change.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q7_volume_shipping.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/7_volume_shipping/7_volume_shipping.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q7_volume_shipping.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/7_volume_shipping/7_volume_shipping.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q7_volume_shipping.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/7_volume_shipping/7_volume_shipping.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q7_volume_shipping.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/7_volume_shipping/7_volume_shipping.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q7_volume_shipping.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/7_volume_shipping/7_volume_shipping.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q7_volume_shipping.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/7_volume_shipping/7_volume_shipping.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q8_national_market_share.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/8_national_market_share/8_national_market_share.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q8_national_market_share.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/8_national_market_share/8_national_market_share.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q8_national_market_share.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/8_national_market_share/8_national_market_share.2.update.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q8_national_market_share.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/8_national_market_share/8_national_market_share.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q8_national_market_share.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/8_national_market_share/8_national_market_share.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q8_national_market_share.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/8_national_market_share/8_national_market_share.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q9_product_type_profit_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/9_product_type_profit_nt/9_product_type_profit_nt.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/q9_product_type_profit_nt.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/9_product_type_profit_nt/9_product_type_profit_nt.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q9_product_type_profit_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/9_product_type_profit_nt/9_product_type_profit_nt.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q9_product_type_profit_nt.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/9_product_type_profit_nt/9_product_type_profit_nt.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q9_product_type_profit_nt.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/9_product_type_profit_nt/9_product_type_profit_nt.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/q9_product_type_profit_nt.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/9_product_type_profit_nt/9_product_type_profit_nt.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by/distinct_by.1.ddl.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by/distinct_by.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by/distinct_by.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by/distinct_by.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by/distinct_by.3.query.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/distinct_by/distinct_by.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg/group_no_agg.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg.aql
rename to asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg/group_no_agg.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg/group_no_agg.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg/group_no_agg.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg/group_no_agg.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg.aql
copy to asterix-app/src/test/resources/runtimets/queries/tpch/group_no_agg/group_no_agg.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01/f01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01/f01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01/f01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01/f01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01/f01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/f01/f01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01/udf01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01/udf01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01/udf01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01/udf01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01/udf01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf01/udf01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02/udf02.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02/udf02.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02/udf02.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02/udf02.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02/udf02.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf02/udf02.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03/udf03.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03/udf03.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03/udf03.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03/udf03.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03/udf03.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf03/udf03.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04/udf04.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04/udf04.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04/udf04.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04/udf04.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04/udf04.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf04/udf04.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05/udf05.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05/udf05.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05/udf05.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05/udf05.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05/udf05.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf05/udf05.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06/udf06.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06/udf06.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06/udf06.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06/udf06.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06/udf06.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf06/udf06.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07/udf07.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07/udf07.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07/udf07.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07/udf07.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07/udf07.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf07/udf07.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08/udf08.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08/udf08.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08/udf08.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08/udf08.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08/udf08.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf08/udf08.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09/udf09.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09/udf09.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09/udf09.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09/udf09.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09/udf09.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf09/udf09.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10/udf10.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10/udf10.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10/udf10.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10/udf10.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10/udf10.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf10/udf10.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11/udf11.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11/udf11.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11/udf11.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11/udf11.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11/udf11.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf11/udf11.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12/udf12.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12/udf12.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12/udf12.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12/udf12.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12/udf12.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf12/udf12.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13/udf13.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13/udf13.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13/udf13.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13/udf13.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13/udf13.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf13/udf13.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14/udf14.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14/udf14.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14/udf14.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14/udf14.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14/udf14.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf14/udf14.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15/udf15.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15/udf15.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15/udf15.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15/udf15.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15/udf15.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf15/udf15.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16/udf16.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16/udf16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16/udf16.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16/udf16.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16/udf16.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf16/udf16.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17/udf17.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17/udf17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17/udf17.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17/udf17.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17/udf17.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf17/udf17.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18/udf18.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18/udf18.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18/udf18.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18/udf18.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18/udf18.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf18/udf18.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19/udf19.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19/udf19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19/udf19.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19/udf19.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19/udf19.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf19/udf19.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20/udf20.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20/udf20.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20/udf20.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20/udf20.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20/udf20.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf20/udf20.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21/udf21.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21/udf21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21/udf21.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21/udf21.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21/udf21.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf21/udf21.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22/udf22.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22/udf22.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22/udf22.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22/udf22.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22/udf22.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf22/udf22.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23/udf23.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23/udf23.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23/udf23.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23/udf23.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23/udf23.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf23/udf23.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24/udf24.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24/udf24.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24/udf24.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24/udf24.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24/udf24.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf24/udf24.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25/udf25.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25/udf25.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25/udf25.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25/udf25.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25/udf25.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf25/udf25.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26/udf26.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26/udf26.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26/udf26.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26/udf26.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26/udf26.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf26/udf26.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27/udf27.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27/udf27.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27/udf27.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27/udf27.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27/udf27.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/udf27/udf27.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/query-issue201.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/uery-issue201/uery-issue201.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/query-issue201.aql
rename to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/uery-issue201/uery-issue201.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/query-issue201.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/uery-issue201/uery-issue201.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/query-issue201.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/uery-issue201/uery-issue201.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/query-issue201.aql b/asterix-app/src/test/resources/runtimets/queries/user-defined-functions/uery-issue201/uery-issue201.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/user-defined-functions/query-issue201.aql
copy to asterix-app/src/test/resources/runtimets/queries/user-defined-functions/uery-issue201/uery-issue201.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/writers/print_01.aql b/asterix-app/src/test/resources/runtimets/queries/writers/print_01/print_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/writers/print_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/writers/print_01/print_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/writers/print_01.aql b/asterix-app/src/test/resources/runtimets/queries/writers/print_01/print_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/writers/print_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/writers/print_01/print_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/writers/print_01.aql b/asterix-app/src/test/resources/runtimets/queries/writers/print_01/print_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/writers/print_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/writers/print_01/print_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/writers/serialized_01.aql b/asterix-app/src/test/resources/runtimets/queries/writers/serialized_01/serialized_01.1.ddl.aql
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/queries/writers/serialized_01.aql
rename to asterix-app/src/test/resources/runtimets/queries/writers/serialized_01/serialized_01.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/writers/serialized_01.aql b/asterix-app/src/test/resources/runtimets/queries/writers/serialized_01/serialized_01.2.update.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/writers/serialized_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/writers/serialized_01/serialized_01.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/writers/serialized_01.aql b/asterix-app/src/test/resources/runtimets/queries/writers/serialized_01/serialized_01.3.query.aql
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/queries/writers/serialized_01.aql
copy to asterix-app/src/test/resources/runtimets/queries/writers/serialized_01/serialized_01.3.query.aql
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_02.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_02.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float_null.adm
deleted file mode 100644
index a957d23..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "average": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int16.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int16.adm
deleted file mode 100644
index 7d61c83..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int16.adm
+++ /dev/null
@@ -1 +0,0 @@
-2.0d
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int16_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int16_null.adm
deleted file mode 100644
index a957d23..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int16_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "average": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int32.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int32.adm
deleted file mode 100644
index 7d61c83..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int32.adm
+++ /dev/null
@@ -1 +0,0 @@
-2.0d
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int32_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int32_null.adm
deleted file mode 100644
index a957d23..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int32_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "average": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int64.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int64.adm
deleted file mode 100644
index 7d61c83..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int64.adm
+++ /dev/null
@@ -1 +0,0 @@
-2.0d
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int64_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int64_null.adm
deleted file mode 100644
index a957d23..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int64_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "average": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int8.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int8.adm
deleted file mode 100644
index 7d61c83..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int8.adm
+++ /dev/null
@@ -1 +0,0 @@
-2.0d
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int8_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int8_null.adm
deleted file mode 100644
index a957d23..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_int8_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "average": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/count_01/count_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/count_01.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/count_01/count_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01/count_empty_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01/count_empty_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_02.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_02.adm
deleted file mode 100644
index 573541a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_02/count_empty_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_02/count_empty_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/count_null/count_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/count_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/count_null/count_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_01/global-avg_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_01.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_01/global-avg_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_null/global-avg_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/global-avg_null/global-avg_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/in_empty_01/in_empty_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/in_empty_01/in_empty_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/in_empty_02/in_empty_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/in_empty_02/in_empty_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double/local-avg_double.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double/local-avg_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null/local-avg_double_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null/local-avg_double_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float.adm
deleted file mode 100644
index 83e5c46..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": 6.0d, "count": 3 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float/local-avg_float.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float/local-avg_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float_null.adm
deleted file mode 100644
index b11c820..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": null, "count": 1 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float_null/local-avg_float_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_float_null/local-avg_float_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16.adm
deleted file mode 100644
index 83e5c46..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": 6.0d, "count": 3 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16/local-avg_int16.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16/local-avg_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16_null.adm
deleted file mode 100644
index b11c820..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": null, "count": 1 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16_null/local-avg_int16_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int16_null/local-avg_int16_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32.adm
deleted file mode 100644
index 83e5c46..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": 6.0d, "count": 3 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32/local-avg_int32.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32/local-avg_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32_null.adm
deleted file mode 100644
index b11c820..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": null, "count": 1 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32_null/local-avg_int32_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int32_null/local-avg_int32_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64.adm
deleted file mode 100644
index 83e5c46..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": 6.0d, "count": 3 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64/local-avg_int64.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64/local-avg_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64_null.adm
deleted file mode 100644
index b11c820..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": null, "count": 1 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64_null/local-avg_int64_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int64_null/local-avg_int64_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8.adm
deleted file mode 100644
index 83e5c46..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": 6.0d, "count": 3 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8/local-avg_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8/local-avg_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8_null.adm
deleted file mode 100644
index b11c820..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "sum": null, "count": 1 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8_null/local-avg_int8_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/local-avg_int8_null/local-avg_int8_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/max_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/max_empty_01.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/max_empty_01.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/max_empty_02.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/max_empty_02.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/max_empty_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/min_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/min_empty_01.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/min_empty_01.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/min_empty_02.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/min_empty_02.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/min_empty_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg/scalar_avg.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg/scalar_avg.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_empty.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_empty.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_empty.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_empty/scalar_avg_empty.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_empty/scalar_avg_empty.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_null/scalar_avg_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_null/scalar_avg_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count/scalar_count.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count/scalar_count.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_empty.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_empty.adm
deleted file mode 100644
index 573541a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_empty.adm
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_empty/scalar_count_empty.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/count_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_empty/scalar_count_empty.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_null/scalar_count_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_count_null/scalar_count_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max/scalar_max.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max/scalar_max.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_empty.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_empty.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_empty.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_empty/scalar_max_empty.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_empty/scalar_max_empty.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_null/scalar_max_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_null/scalar_max_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min/scalar_min.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min/scalar_min.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_empty.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_empty.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_empty.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_empty/scalar_min_empty.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_empty/scalar_min_empty.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_null.adm
deleted file mode 100644
index c9f3cb3..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_null.adm
+++ /dev/null
@@ -1,8 +0,0 @@
-null
-null
-null
-null
-null
-null
-null
-null
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_null/scalar_min_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_max_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_min_null/scalar_min_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_su/scalar_su.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_su/scalar_su.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty/scalar_sum_empty.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty/scalar_sum_empty.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null.adm
deleted file mode 100644
index 0800a91..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null.adm
+++ /dev/null
@@ -1,6 +0,0 @@
-null
-null
-null
-null
-null
-null
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null/scalar_sum_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/scalar_avg_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null/scalar_sum_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double/sum_double.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_double.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_double/sum_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null/sum_double_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null/sum_double_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01/sum_empty_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01/sum_empty_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02/sum_empty_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02/sum_empty_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float/sum_float.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_float.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_float/sum_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null.adm
deleted file mode 100644
index ec747fa..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null/sum_float_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null/sum_float_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16/sum_int16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16/sum_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null.adm
deleted file mode 100644
index ec747fa..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null/sum_int16_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null/sum_int16_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32/sum_int32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32/sum_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null.adm
deleted file mode 100644
index ec747fa..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null/sum_int32_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null/sum_int32_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64/sum_int64.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64/sum_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null.adm
deleted file mode 100644
index ec747fa..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null/sum_int64_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null/sum_int64_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8/sum_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8/sum_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null/sum_int8_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null/sum_int8_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_null-with-pred.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_null-with-pre/sum_null-with-pre.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/sum_null-with-pred.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/sum_null-with-pre/sum_null-with-pre.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null.adm
deleted file mode 100644
index 19765bd..0000000
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-null
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null/sum_numeric_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null/sum_numeric_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_double/vg_double.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/vg_double/vg_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_double_null/vg_double_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_double_null/vg_double_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_empty_01/vg_empty_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_empty_01/vg_empty_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_empty_02/vg_empty_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_empty_02/vg_empty_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_float/vg_float.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_float/vg_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_float_null/vg_float_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_float_null/vg_float_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int16/vg_int16.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int16/vg_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int16_null/vg_int16_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int16_null/vg_int16_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int32/vg_int32.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int32/vg_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int32_null/vg_int32_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int32_null/vg_int32_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int64/vg_int64.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int64/vg_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int64_null/vg_int64_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int64_null/vg_int64_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int8/vg_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/avg_float.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int8/vg_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/vg_int8_null/vg_int8_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/avg_double_null.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/vg_int8_null/vg_int8_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/x_empty_01/x_empty_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
rename to asterix-app/src/test/resources/runtimets/results/aggregate/x_empty_01/x_empty_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/x_empty_02/x_empty_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/aggregate/avg_empty_01.adm
copy to asterix-app/src/test/resources/runtimets/results/aggregate/x_empty_02/x_empty_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/boolean/and_null_false.adm b/asterix-app/src/test/resources/runtimets/results/boolean/and_null_false.adm
deleted file mode 100644
index 02e4a84..0000000
--- a/asterix-app/src/test/resources/runtimets/results/boolean/and_null_false.adm
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/boolean/and_01.adm b/asterix-app/src/test/resources/runtimets/results/boolean/nd_01/nd_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/boolean/and_01.adm
rename to asterix-app/src/test/resources/runtimets/results/boolean/nd_01/nd_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/boolean/and_null.adm b/asterix-app/src/test/resources/runtimets/results/boolean/nd_null/nd_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/boolean/and_null.adm
rename to asterix-app/src/test/resources/runtimets/results/boolean/nd_null/nd_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/boolean/and_01.adm b/asterix-app/src/test/resources/runtimets/results/boolean/nd_null_false/nd_null_false.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/boolean/and_01.adm
copy to asterix-app/src/test/resources/runtimets/results/boolean/nd_null_false/nd_null_false.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/boolean/not_01.adm b/asterix-app/src/test/resources/runtimets/results/boolean/not_01/not_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/boolean/not_01.adm
rename to asterix-app/src/test/resources/runtimets/results/boolean/not_01/not_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/eq_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/eq_01/eq_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/eq_01.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/eq_01/eq_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/float.adm b/asterix-app/src/test/resources/runtimets/results/comparison/float/float.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/float.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/float/float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/float_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/float_null.adm
deleted file mode 100644
index 9f32100..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/float_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": null, "result2": null, "result3": null, "result4": null, "result5": null, "result6": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/float_null/float_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/float_null/float_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/gt_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/gt_01/gt_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/gt_01.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/gt_01/gt_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/gte_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/gte_01.adm
deleted file mode 100644
index 446a462..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/gte_01.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-3
-2
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/gt_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/gte_01/gte_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/gt_01.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/gte_01/gte_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int16.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int16/int16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/int16.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/int16/int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int16_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int16_null.adm
deleted file mode 100644
index 9f32100..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/int16_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": null, "result2": null, "result3": null, "result4": null, "result5": null, "result6": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int16_null/int16_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/int16_null/int16_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int32.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int32/int32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/int32.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/int32/int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int32_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int32_null.adm
deleted file mode 100644
index 9f32100..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/int32_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": null, "result2": null, "result3": null, "result4": null, "result5": null, "result6": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int32_null/int32_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/int32_null/int32_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int64.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int64/int64.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/int64.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/int64/int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int64_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int64_null.adm
deleted file mode 100644
index 9f32100..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/int64_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": null, "result2": null, "result3": null, "result4": null, "result5": null, "result6": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int64_null/int64_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/int64_null/int64_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int8.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int8.adm
deleted file mode 100644
index 6126426..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/int8.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false, "result2": false, "result3": true, "result4": false, "result5": false, "result6": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int64.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int8/int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/int64.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/int8/int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/int8_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int8_null.adm
deleted file mode 100644
index 9f32100..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/int8_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": null, "result2": null, "result3": null, "result4": null, "result5": null, "result6": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/int8_null/int8_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/int8_null/int8_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/lt_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/lt_01/lt_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/lt_01.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/lt_01/lt_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/lte_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/lte_01.adm
deleted file mode 100644
index 7a754f4..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/lte_01.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-1
-2
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/lt_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/lte_01/lte_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/lt_01.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/lte_01/lte_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/neq_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/neq_01/neq_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/neq_01.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/neq_01/neq_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/numeric-comparison_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/numeric-comparison_01/numeric-comparison_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/numeric-comparison_01.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/numeric-comparison_01/numeric-comparison_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double.adm b/asterix-app/src/test/resources/runtimets/results/comparison/ouble/ouble.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/double.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/ouble/ouble.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_gte_01.adm b/asterix-app/src/test/resources/runtimets/results/comparison/ouble_gte_01/ouble_gte_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/double_gte_01.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/ouble_gte_01/ouble_gte_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/ouble_null/ouble_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/ouble_null/ouble_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/string.adm b/asterix-app/src/test/resources/runtimets/results/comparison/string/string.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/string.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/string/string.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/string_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/string_null.adm
deleted file mode 100644
index 9f32100..0000000
--- a/asterix-app/src/test/resources/runtimets/results/comparison/string_null.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": null, "result2": null, "result3": null, "result4": null, "result5": null, "result6": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm b/asterix-app/src/test/resources/runtimets/results/comparison/string_null/string_null.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/comparison/double_null.adm
copy to asterix-app/src/test/resources/runtimets/results/comparison/string_null/string_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/date_order.adm b/asterix-app/src/test/resources/runtimets/results/comparison/te_order/te_order.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/date_order.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/te_order/te_order.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/datetime_order.adm b/asterix-app/src/test/resources/runtimets/results/comparison/tetime_order/tetime_order.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/datetime_order.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/tetime_order/tetime_order.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/datetime_range.adm b/asterix-app/src/test/resources/runtimets/results/comparison/tetime_range/tetime_range.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/datetime_range.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/tetime_range/tetime_range.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/datetime_tzeq.adm b/asterix-app/src/test/resources/runtimets/results/comparison/tetime_tzeq/tetime_tzeq.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/datetime_tzeq.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/tetime_tzeq/tetime_tzeq.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/comparison/time_order.adm b/asterix-app/src/test/resources/runtimets/results/comparison/time_order/time_order.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/comparison/time_order.adm
rename to asterix-app/src/test/resources/runtimets/results/comparison/time_order/time_order.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/add-null.adm b/asterix-app/src/test/resources/runtimets/results/constructor/-null/-null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/add-null.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/-null/-null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/boolean_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/boolean_01/boolean_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/boolean_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/boolean_01/boolean_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/circle_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/circle_01/circle_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/circle_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/circle_01/circle_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/float_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/float_01/float_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/float_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/float_01/float_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/int_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/int_01/int_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/int_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/int_01/int_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/interval.adm b/asterix-app/src/test/resources/runtimets/results/constructor/interval/interval.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/interval.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/interval/interval.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/line_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/line_01/line_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/line_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/line_01/line_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/double_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/ouble_01/ouble_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/double_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/ouble_01/ouble_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/point_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/point_01/point_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/point_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/point_01/point_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/polygon_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/polygon_01/polygon_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/polygon_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/polygon_01/polygon_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/primitive-01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/primitive-01/primitive-01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/primitive-01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/primitive-01/primitive-01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/primitive-02.adm b/asterix-app/src/test/resources/runtimets/results/constructor/primitive-02/primitive-02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/primitive-02.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/primitive-02/primitive-02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/primitive-03.adm b/asterix-app/src/test/resources/runtimets/results/constructor/primitive-03/primitive-03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/primitive-03.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/primitive-03/primitive-03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/primitive-04.adm b/asterix-app/src/test/resources/runtimets/results/constructor/primitive-04/primitive-04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/primitive-04.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/primitive-04/primitive-04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/string_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/string_01/string_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/string_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/string_01/string_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/date_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/te_01/te_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/date_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/te_01/te_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/datetime_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/tetime_01/tetime_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/datetime_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/tetime_01/tetime_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/time_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/time_01/time_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/time_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/time_01/time_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/duration_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/uration_01/uration_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/constructor/duration_01.adm
rename to asterix-app/src/test/resources/runtimets/results/constructor/uration_01/uration_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv01.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv01/cross-dv01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv01.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv01/cross-dv01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02/cross-dv02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02/cross-dv02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv03.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv03/cross-dv03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv03.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv03/cross-dv03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04/cross-dv04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04/cross-dv04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv07.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv07/cross-dv07.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv07.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv07/cross-dv07.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv09.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv09/cross-dv09.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv09.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv09/cross-dv09.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv11.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv11/cross-dv11.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv11.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv11/cross-dv11.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv12.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv12/cross-dv12.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv12.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv12/cross-dv12.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv14.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv14/cross-dv14.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv14.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv14/cross-dv14.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv17.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv17/cross-dv17.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv17.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv17/cross-dv17.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19/cross-dv19.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19/cross-dv19.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/metadata_dataset.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/etadata_dataset/etadata_dataset.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/metadata_dataset.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/etadata_dataset/etadata_dataset.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_across_dataverses.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_across_dataverses.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_from_source_dataset.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_from_source_dataset.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/join_across_dataverses.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/join_across_dataverses/join_across_dataverses.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/join_across_dataverses.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/join_across_dataverses/join_across_dataverses.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/drop_dataset.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/rop_dataset/rop_dataset.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/cross-dataverse/drop_dataset.adm
rename to asterix-app/src/test/resources/runtimets/results/cross-dataverse/rop_dataset/rop_dataset.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_01.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_01/customer_q_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_01.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_01/customer_q_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_02.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_02/customer_q_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_02.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_02/customer_q_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_03.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_03/customer_q_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_03.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_03/customer_q_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_04.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_04/customer_q_04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_04.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_04/customer_q_04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_05.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_05/customer_q_05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_05.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_05/customer_q_05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_06.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_06/customer_q_06.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_06.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_06/customer_q_06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_07.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_07/customer_q_07.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_07.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_07/customer_q_07.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/customer_q_08.adm b/asterix-app/src/test/resources/runtimets/results/custord/customer_q_08/customer_q_08.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/customer_q_08.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/customer_q_08/customer_q_08.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/denorm-cust-order_02.adm b/asterix-app/src/test/resources/runtimets/results/custord/enorm-cust-order_02/enorm-cust-order_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/denorm-cust-order_02.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/enorm-cust-order_02/enorm-cust-order_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/join_q_01.adm b/asterix-app/src/test/resources/runtimets/results/custord/join_q_01/join_q_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/join_q_01.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/join_q_01/join_q_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/join_q_02.adm b/asterix-app/src/test/resources/runtimets/results/custord/join_q_02/join_q_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/join_q_02.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/join_q_02/join_q_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/join_q_03.adm b/asterix-app/src/test/resources/runtimets/results/custord/join_q_03/join_q_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/join_q_03.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/join_q_03/join_q_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/join_q_04.adm b/asterix-app/src/test/resources/runtimets/results/custord/join_q_04/join_q_04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/join_q_04.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/join_q_04/join_q_04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/load-test.adm b/asterix-app/src/test/resources/runtimets/results/custord/load-test/load-test.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/load-test.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/load-test/load-test.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/order_q_01.adm b/asterix-app/src/test/resources/runtimets/results/custord/order_q_01/order_q_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/order_q_01.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/order_q_01/order_q_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/order_q_02.adm b/asterix-app/src/test/resources/runtimets/results/custord/order_q_02/order_q_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/order_q_02.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/order_q_02/order_q_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/order_q_03.adm b/asterix-app/src/test/resources/runtimets/results/custord/order_q_03/order_q_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/order_q_03.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/order_q_03/order_q_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/order_q_04.adm b/asterix-app/src/test/resources/runtimets/results/custord/order_q_04/order_q_04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/order_q_04.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/order_q_04/order_q_04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/order_q_05.adm b/asterix-app/src/test/resources/runtimets/results/custord/order_q_05/order_q_05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/order_q_05.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/order_q_05/order_q_05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/custord/order_q_06.adm b/asterix-app/src/test/resources/runtimets/results/custord/order_q_06/order_q_06.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/custord/order_q_06.adm
rename to asterix-app/src/test/resources/runtimets/results/custord/order_q_06/order_q_06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dapd/q1.adm b/asterix-app/src/test/resources/runtimets/results/dapd/q1/q1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dapd/q1.adm
rename to asterix-app/src/test/resources/runtimets/results/dapd/q1/q1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dapd/q2.adm b/asterix-app/src/test/resources/runtimets/results/dapd/q2/q2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dapd/q2.adm
rename to asterix-app/src/test/resources/runtimets/results/dapd/q2/q2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/create-drop-cltype.adm b/asterix-app/src/test/resources/runtimets/results/dml/create-drop-cltype/create-drop-cltype.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/create-drop-cltype.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/create-drop-cltype/create-drop-cltype.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/create-drop-opntype.adm b/asterix-app/src/test/resources/runtimets/results/dml/create-drop-opntype/create-drop-opntype.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/create-drop-opntype.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/create-drop-opntype/create-drop-opntype.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/delete-from-loaded-dataset-with-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/elete-from-loaded-dataset-with-index/elete-from-loaded-dataset-with-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/delete-from-loaded-dataset-with-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/elete-from-loaded-dataset-with-index/elete-from-loaded-dataset-with-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/delete-from-loaded-dataset.adm b/asterix-app/src/test/resources/runtimets/results/dml/elete-from-loaded-dataset/elete-from-loaded-dataset.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/delete-from-loaded-dataset.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/elete-from-loaded-dataset/elete-from-loaded-dataset.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/empty-load.adm b/asterix-app/src/test/resources/runtimets/results/dml/empty-lo/empty-lo.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/empty-load.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/empty-lo/empty-lo.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/empty-load-with-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/empty-load-with-index/empty-load-with-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/empty-load-with-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/empty-load-with-index/empty-load-with-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm
deleted file mode 100644
index 1b6c344..0000000
--- a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "l_orderkey": 1, "l_linenumber": 2, "l_suppkey": 3 }
-{ "l_orderkey": 2, "l_linenumber": 3, "l_suppkey": 4 }
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01.adm
copy to asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset.adm
deleted file mode 100644
index 1b6c344..0000000
--- a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "l_orderkey": 1, "l_linenumber": 2, "l_suppkey": 3 }
-{ "l_orderkey": 2, "l_linenumber": 3, "l_suppkey": 4 }
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_01.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_01.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_02.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_02.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01.adm
copy to asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_02.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_02.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-src-dst-01.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-src-dst-01/insert-src-dst-01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert-src-dst-01.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert-src-dst-01/insert-src-dst-01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert/insert.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert/insert.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert_less_nc.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert_less_nc/insert_less_nc.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert_less_nc.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert_less_nc/insert_less_nc.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/load-from-hdfs.adm b/asterix-app/src/test/resources/runtimets/results/dml/load-from-hdfs/load-from-hdfs.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/load-from-hdfs.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/load-from-hdfs/load-from-hdfs.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/load-with-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/load-with-index/load-with-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/load-with-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/load-with-index/load-with-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o-recursive.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o-recursive.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o/opentype-c2o.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-c2o/opentype-c2o.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-closed-optional.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-closed-optional/opentype-closed-optional.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-closed-optional.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-closed-optional/opentype-closed-optional.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-insert.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-insert/opentype-insert.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-insert.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-insert/opentype-insert.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-insert2.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-insert2/opentype-insert2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-insert2.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-insert2/opentype-insert2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-noexpand.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-noexpan/opentype-noexpan.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-noexpand.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-noexpan/opentype-noexpan.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c-recursive.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c-recursive.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c/opentype-o2c.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-o2c/opentype-o2c.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/opentype-o2o.adm b/asterix-app/src/test/resources/runtimets/results/dml/opentype-o2o/opentype-o2o.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/opentype-o2o.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/opentype-o2o/opentype-o2o.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/query-issue205.adm b/asterix-app/src/test/resources/runtimets/results/dml/query-issue205/query-issue205.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/query-issue205.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/query-issue205/query-issue205.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/drop-empty-secondary-indexes.adm b/asterix-app/src/test/resources/runtimets/results/dml/rop-empty-secondary-indexes/rop-empty-secondary-indexes.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/drop-empty-secondary-indexes.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/rop-empty-secondary-indexes/rop-empty-secondary-indexes.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/drop-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/rop-index/rop-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/drop-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/rop-index/rop-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-btree-secondary-index-nullable.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/scan-delete-btree-secondary-index-nullable.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index-nullable.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index-nullable.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-btree-secondary-index-nullable.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-btree-secondary-index-nullable.adm
deleted file mode 100644
index a12b9b9..0000000
--- a/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-btree-secondary-index-nullable.adm
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "cid": 3, "name": "Phung Wheetley", "age": 12, "address": { "number": 5549, "street": "Hill St.", "city": "Mountain View" }, "interests": {{ "Wine" }}, "children": [ { "name": "Raelene Wheetley", "age": null }, { "name": "Dudley Wheetley", "age": null } ] }
-{ "cid": 11, "name": "Meta Simek", "age": 13, "address": { "number": 4384, "street": "7th St.", "city": "San Jose" }, "interests": {{ "Wine", "Walking" }}, "children": [ { "name": "Oretha Simek", "age": null }, { "name": "Terence Simek", "age": null } ] }
-{ "cid": 52, "name": "Janna Tish", "age": 12, "address": { "number": 2598, "street": "Washington St.", "city": "San Jose" }, "interests": {{  }}, "children": [ { "name": "Mackenzie Tish", "age": null }, { "name": "Ettie Tish", "age": null }, { "name": "Hortencia Tish", "age": null }, { "name": "Paul Tish", "age": null } ] }
-{ "cid": 55, "name": "Terrence Bryant", "age": 12, "address": { "number": 3188, "street": "Park St.", "city": "Seattle" }, "interests": {{ "Wine", "Cooking" }}, "children": [ { "name": "Dayna Bryant", "age": null } ] }
-{ "cid": 61, "name": "Linsey Mose", "age": 17, "address": { "number": 9198, "street": "Lake St.", "city": "Portland" }, "interests": {{ "Puzzles" }}, "children": [ { "name": "Tilda Mose", "age": null }, { "name": "Lillie Mose", "age": null }, { "name": "Robyn Mose", "age": null } ] }
-{ "cid": 92, "name": "Kenny Laychock", "age": 15, "address": { "number": 4790, "street": "Washington St.", "city": "Portland" }, "interests": {{ "Video Games", "Basketball" }}, "children": [  ] }
-{ "cid": 111, "name": "Eddy Ortea", "age": 16, "address": { "number": 6874, "street": "Main St.", "city": "Los Angeles" }, "interests": {{  }}, "children": [ { "name": "Shera Ortea", "age": null } ] }
-{ "cid": 112, "name": "Dorie Lave", "age": 10, "address": { "number": 2286, "street": "Lake St.", "city": "Los Angeles" }, "interests": {{ "Coffee" }}, "children": [ { "name": "Grady Lave", "age": null }, { "name": "Daysi Lave", "age": null } ] }
-{ "cid": 144, "name": "Celesta Sosebee", "age": 19, "address": { "number": 2683, "street": "7th St.", "city": "Portland" }, "interests": {{ "Databases", "Databases" }}, "children": [ { "name": "Jesse Sosebee", "age": null }, { "name": "Oralee Sosebee", "age": null }, { "name": "Sunday Sosebee", "age": null } ] }
-{ "cid": 146, "name": "Glennis Vanruiten", "age": 14, "address": { "number": 8272, "street": "Park St.", "city": "Los Angeles" }, "interests": {{ "Squash", "Databases" }}, "children": [ { "name": "Joanie Vanruiten", "age": null }, { "name": "Long Vanruiten", "age": null }, { "name": "Abdul Vanruiten", "age": null } ] }
-{ "cid": 153, "name": "Randy Hueso", "age": 11, "address": { "number": 1957, "street": "Oak St.", "city": "San Jose" }, "interests": {{ "Computers", "Wine", "Databases", "Walking" }}, "children": [  ] }
-{ "cid": 186, "name": "Krystle Spangler", "age": 15, "address": { "number": 4697, "street": "Cedar St.", "city": "Seattle" }, "interests": {{ "Cigars", "Squash", "Coffee", "Video Games" }}, "children": [  ] }
-{ "cid": 192, "name": "Shakira Delmonte", "age": 10, "address": { "number": 8838, "street": "Park St.", "city": "Sunnyvale" }, "interests": {{ "Books", "Cigars", "Bass", "Base Jumping" }}, "children": [ { "name": "Sergio Delmonte", "age": null }, { "name": "Aida Delmonte", "age": null }, { "name": "Juliane Delmonte", "age": null } ] }
-{ "cid": 195, "name": "Annetta Demille", "age": 17, "address": { "number": 5722, "street": "Park St.", "city": "Portland" }, "interests": {{ "Bass" }}, "children": [ { "name": "Natacha Demille", "age": null }, { "name": "Giuseppe Demille", "age": null }, { "name": "Kami Demille", "age": null }, { "name": "Jewell Demille", "age": null } ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-delete-btree-secondary-index-nullable.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/dml/scan-delete-btree-secondary-index-nullable.adm
copy to asterix-app/src/test/resources/runtimets/results/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index-nullable.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index-nullable.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/employee/q_01.adm b/asterix-app/src/test/resources/runtimets/results/employee/q_01/q_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/employee/q_01.adm
rename to asterix-app/src/test/resources/runtimets/results/employee/q_01/q_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/employee/q_02.adm b/asterix-app/src/test/resources/runtimets/results/employee/q_02/q_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/employee/q_02.adm
rename to asterix-app/src/test/resources/runtimets/results/employee/q_02/q_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/failure/delete-rtree.adm b/asterix-app/src/test/resources/runtimets/results/failure/elete-rtree/elete-rtree.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/failure/delete-rtree.adm
rename to asterix-app/src/test/resources/runtimets/results/failure/elete-rtree/elete-rtree.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/failure/delete.adm b/asterix-app/src/test/resources/runtimets/results/failure/elete/elete.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/failure/delete.adm
rename to asterix-app/src/test/resources/runtimets/results/failure/elete/elete.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/failure/insert-rtree.adm b/asterix-app/src/test/resources/runtimets/results/failure/insert-rtree/insert-rtree.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/failure/insert-rtree.adm
rename to asterix-app/src/test/resources/runtimets/results/failure/insert-rtree/insert-rtree.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/failure/insert.adm b/asterix-app/src/test/resources/runtimets/results/failure/insert/insert.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/failure/insert.adm
rename to asterix-app/src/test/resources/runtimets/results/failure/insert/insert.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/failure/q1_pricing_summary_report_failure.adm b/asterix-app/src/test/resources/runtimets/results/failure/q1_pricing_summary_report_failure/q1_pricing_summary_report_failure.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/failure/q1_pricing_summary_report_failure.adm
rename to asterix-app/src/test/resources/runtimets/results/failure/q1_pricing_summary_report_failure/q1_pricing_summary_report_failure.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01.adm b/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/feeds/feeds_01.adm
rename to asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/feeds/feeds_02.adm b/asterix-app/src/test/resources/runtimets/results/feeds/feeds_02/feeds_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/feeds/feeds_02.adm
rename to asterix-app/src/test/resources/runtimets/results/feeds/feeds_02/feeds_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/feeds/feeds_03.adm b/asterix-app/src/test/resources/runtimets/results/feeds/feeds_03/feeds_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/feeds/feeds_03.adm
rename to asterix-app/src/test/resources/runtimets/results/feeds/feeds_03/feeds_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/feeds/feeds_04.adm b/asterix-app/src/test/resources/runtimets/results/feeds/feeds_04/feeds_04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/feeds/feeds_04.adm
rename to asterix-app/src/test/resources/runtimets/results/feeds/feeds_04/feeds_04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/feeds/issue_230_feeds.adm b/asterix-app/src/test/resources/runtimets/results/feeds/issue_230_feeds.adm
deleted file mode 100644
index 9720960..0000000
--- a/asterix-app/src/test/resources/runtimets/results/feeds/issue_230_feeds.adm
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "id": "nc1:1", "username": "BronsonMike", "location": "", "text": "@GottaLaff @reutersus Christie and obama just foul weather friends", "timestamp": "Thu Dec 06 16:53:06 PST 2012" }
-{ "id": "nc1:100", "username": "KidrauhlProuds", "location": "", "text": "RT @01Direclieber: A filha do Michael Jackson  uma Belieber,a filha do Eminem e uma Belieber,as filhas de Obama sao Beliebers, e a filha do meu pai e Belieber", "timestamp": "Thu Dec 06 16:53:16 PST 2012" }
-{ "id": "nc1:102", "username": "jaysauce82", "location": "", "text": "Not voting for President Obama #BadDecision", "timestamp": "Thu Dec 06 16:53:16 PST 2012" }
-{ "id": "nc1:104", "username": "princeofsupras", "location": "", "text": "RT @01Direclieber: A filha do Michael Jackson e uma Belieber,a filha do Eminem e uma Belieber,as filhas de Obama sao Beliebers, e a filha do meu pai e Belieber", "timestamp": "Thu Dec 06 16:53:15 PST 2012" }
-{ "id": "nc1:106", "username": "GulfDogs", "location": "", "text": "Obama Admin Knew Libyan Terrorists Had US-Provided Weaponsteaparty #tcot #ccot #NewGuards #BreitbartArmy #patriotwttp://t.co/vJxzrQUE", "timestamp": "Thu Dec 06 16:53:14 PST 2012" }
-{ "id": "nc1:108", "username": "Laugzpz", "location": "", "text": "@AlfredoJalife Maestro Obama se hace de la vista gorda, es un acuerdo de siempre creo yo.", "timestamp": "Thu Dec 06 16:53:14 PST 2012" }
-{ "id": "nc1:11", "username": "magarika", "location": "", "text": "RT @ken24xavier: Obama tells SOROS - our plan is ALMOST finished http://t.co/WvzK0GtU", "timestamp": "Thu Dec 06 16:53:05 PST 2012" }
-{ "id": "nc1:111", "username": "ToucanMall", "location": "", "text": "RT @WorldWar3Watch: Michelle Obama Gets More Grammy Nominations Than Justin ...  #Obama #WW3 http://t.co/0Wv2GKij", "timestamp": "Thu Dec 06 16:53:13 PST 2012" }
-{ "id": "nc1:113", "username": "ToucanMall", "location": "", "text": "RT @ObamaPalooza: Tiffany Shared What $2,000 Meant to Her ... and the President Stopped by to Talk About It http://t.co/sgT7lsNV #Obama", "timestamp": "Thu Dec 06 16:53:12 PST 2012" }
-{ "id": "nc1:115", "username": "thewildpitch", "location": "", "text": "RT @RevkahJC: Dennis Miller: Obama Should Just Say He Wants To Tax Successful People http://t.co/Ihlemy9Y", "timestamp": "Thu Dec 06 16:53:11 PST 2012" }
-{ "id": "nc1:117", "username": "Rnugent24", "location": "", "text": "RT @ConservativeQuo: unemployment is above 8% again. I wonder how long it will take for Obama to start blaming Bush? 3-2-1 #tcot #antiobama", "timestamp": "Thu Dec 06 16:53:10 PST 2012" }
-{ "id": "nc1:119", "username": "ToucanMall", "location": "", "text": "RT @Newitrsdotcom: I hope #Obama will win re-election... Other four years without meaningless #wars", "timestamp": "Thu Dec 06 16:53:09 PST 2012" }
diff --git a/asterix-app/src/test/resources/runtimets/results/feeds/feeds_02.adm b/asterix-app/src/test/resources/runtimets/results/feeds/issue_230_feeds/issue_230_feeds.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/feeds/feeds_02.adm
copy to asterix-app/src/test/resources/runtimets/results/feeds/issue_230_feeds/issue_230_feeds.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-01.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-01/ret-01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-01.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-01/ret-01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-02.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-02/ret-02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-02.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-02/ret-02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-03.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-03/ret-03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-03.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-03/ret-03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-04.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-04/ret-04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-04.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-04/ret-04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-05.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-05/ret-05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-05.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-05/ret-05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-06.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-06/ret-06.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-06.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-06/ret-06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-07.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-07/ret-07.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-07.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-07/ret-07.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-08.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-08/ret-08.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-08.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-08/ret-08.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-09.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-09.adm
deleted file mode 100644
index d00491f..0000000
--- a/asterix-app/src/test/resources/runtimets/results/flwor/ret-09.adm
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/01.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-09/ret-09.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/subset-collection/01.adm
copy to asterix-app/src/test/resources/runtimets/results/flwor/ret-09/ret-09.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-10.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-10/ret-10.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-10.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-10/ret-10.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-11.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-11/ret-11.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-11.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-11/ret-11.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-12.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-12/ret-12.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-12.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-12/ret-12.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-13.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-13/ret-13.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-13.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-13/ret-13.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-14.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-14/ret-14.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-14.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-14/ret-14.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-15.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-15/ret-15.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-15.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-15/ret-15.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-16.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-16/ret-16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-16.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-16/ret-16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-17.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-17.adm
deleted file mode 100644
index 27ba77d..0000000
--- a/asterix-app/src/test/resources/runtimets/results/flwor/ret-17.adm
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-16.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-17/ret-17.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/flwor/ret-16.adm
copy to asterix-app/src/test/resources/runtimets/results/flwor/ret-17/ret-17.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-18.adm b/asterix-app/src/test/resources/runtimets/results/flwor/ret-18/ret-18.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/flwor/ret-18.adm
rename to asterix-app/src/test/resources/runtimets/results/flwor/ret-18/ret-18.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_1/blp-1_1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_1/blp-1_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_2.1.1/blp-1_2.1.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_2.1.1/blp-1_2.1.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_2.1/blp-1_2.1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_2.1/blp-1_2.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_2/blp-1_2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-1_2/blp-1_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.1_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2.1_5.3.1/blp-2.1_5.3.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.1_5.3.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2.1_5.3.1/blp-2.1_5.3.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.1_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2.2/blp-2.2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.1_5.3.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2.2/blp-2.2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_1/blp-2_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_1/blp-2_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_2/blp-2_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_2/blp-2_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_3/blp-2_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_3/blp-2_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_4/blp-2_4.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_4/blp-2_4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.1/blp-2_5.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.1/blp-2_5.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.2/blp-2_5.2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.2/blp-2_5.2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.3.1/blp-2_5.3.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.3.1/blp-2_5.3.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.3/blp-2_5.3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.3.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5.3/blp-2_5.3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5/blp-2_5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-2_5/blp-2_5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-3_1.1/blp-3_1.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-3_1.1/blp-3_1.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-3_1.2/blp-3_1.2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-3_1.2/blp-3_1.2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-3_1/blp-3_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-3_1/blp-3_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-aqlplus_1/blp-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-aqlplus_1/blp-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-aqlplus_2/blp-aqlplus_2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-aqlplus_2.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-aqlplus_2/blp-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_1/blp-csx-2_1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_1/blp-csx-2_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_2/blp-csx-2_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_2/blp-csx-2_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_3/blp-csx-2_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_3/blp-csx-2_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_4/blp-csx-2_4.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_4/blp-csx-2_4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.1/blp-csx-2_5.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.1/blp-csx-2_5.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.2/blp-csx-2_5.2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.2/blp-csx-2_5.2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.3.1/blp-csx-2_5.3.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.3.1/blp-csx-2_5.3.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.3/blp-csx-2_5.3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5.3/blp-csx-2_5.3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5/blp-csx-2_5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_5/blp-csx-2_5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_6.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_6.3.1/blp-csx-2_6.3.1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_6.3.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-2_6.3.1/blp-csx-2_6.3.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_1.1/blp-csx-3_1.1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_1.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_1.1/blp-csx-3_1.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_1.2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_1.2/blp-csx-3_1.2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_1.2.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_1.2/blp-csx-3_1.2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_1/blp-csx-3_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_1/blp-csx-3_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_2/blp-csx-3_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_2/blp-csx-3_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_3/blp-csx-3_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_3/blp-csx-3_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_4/blp-csx-3_4.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_4/blp-csx-3_4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.1/blp-csx-3_5.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.1/blp-csx-3_5.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.2/blp-csx-3_5.2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.2/blp-csx-3_5.2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.3.1/blp-csx-3_5.3.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.3.1/blp-csx-3_5.3.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.3/blp-csx-3_5.3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.3/blp-csx-3_5.3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.4.1/blp-csx-3_5.4.1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.4.1/blp-csx-3_5.4.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.4/blp-csx-3_5.4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5.4/blp-csx-3_5.4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5/blp-csx-3_5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-3_5/blp-csx-3_5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-aqlplus_1/blp-csx-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-aqlplus_1/blp-csx-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-aqlplus_2/blp-csx-aqlplus_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-aqlplus_2/blp-csx-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-aqlplus_3/blp-csx-aqlplus_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-aqlplus_3/blp-csx-aqlplus_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-dblp-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-dblp-aqlplus_1/blp-csx-dblp-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-dblp-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-csx-dblp-aqlplus_1/blp-csx-dblp-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-lookup_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-lookup_1/blp-lookup_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-lookup_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/blp-lookup_1/blp-lookup_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_1.adm
deleted file mode 100644
index 8b231c5..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_1.adm
+++ /dev/null
@@ -1,302 +0,0 @@
--2100346009
--2099271744
--2095729781
--2092234318
--2064380931
--2044228573
--2041394379
--1995931552
--1961708102
--1930672765
--1925061768
--1884800058
--1884722688
--1843785300
--1830483328
--1827399817
--1823572306
--1800928259
--1768694843
--1768045679
--1743779108
--1742028699
--1740509970
--1732505408
--1729705254
--1655516304
--1626188505
--1609006415
--1598505188
--1594487989
--1553380510
--1535341846
--1442878015
--1419814343
--1396219568
--1349551945
--1311409178
--1296587453
--1240806000
--1225430010
--1064858130
--1063109284
--1045566799
--1044558419
--1022590190
--1016071050
--1006350002
--982216652
--975530700
--959052990
--956760709
--915533807
--883971423
--835336873
--822173589
--794144920
--780204151
--777420573
--760580623
--755156292
--743268693
--684781892
--606045019
--570170013
--565948000
--534825744
--523516656
--509449562
--498627020
--466739899
--452599430
--448767586
--434432019
--423176309
--368783024
--364546240
--359166347
--348047278
--312742449
--297504936
--246704257
--241549963
--205768560
--186625582
--180072229
--166827474
--161256337
--159726822
--159089000
--157616828
--132223855
--130046697
--104490550
--30501291
--25268558
--15352091
--4365677
-22917776
-94735359
-99986803
-114154416
-118521833
-202777882
-204805762
-213361009
-235005948
-238725193
-260903781
-277037318
-285049676
-307007687
-329122349
-329859751
-352835028
-364775212
-372271254
-380248390
-382366039
-427003385
-469812361
-481345800
-500833678
-540752742
-544185827
-593160419
-606318607
-610756166
-667333696
-675209541
-690242600
-699979219
-731670499
-797735848
-812584443
-827265626
-860604615
-913801175
-914572729
-980458902
-997867566
-1020946265
-1021364621
-1029604200
-1061886827
-1080617081
-1081527870
-1092992558
-1101732966
-1122042649
-1184281538
-1194310461
-1202560340
-1213966713
-1216682124
-1234142640
-1250804875
-1267820964
-1301392510
-1311122045
-1328804107
-1345028738
-1393258922
-1393904549
-1408073343
-1475217659
-1487581554
-1576421485
-1591147181
-1593768276
-1630132998
-1663722522
-1669137324
-1692834009
-1695382779
-1725807273
-1741263740
-1743340180
-1748224791
-1769943268
-1843219182
-1843309411
-1899428720
-1961904540
-1992104541
-1996585684
-2016705058
-2023897578
-2031126056
-2061814519
-2064356955
-2077568601
-2142119869
--2129148808
--2123306067
--1866357545
--1830272775
--1698686135
--1675097392
--1424260364
--1101893819
--1101893818
--983571329
--928358681
--886125391
--868634819
--820263423
--813973322
--811126360
--672919447
--644628342
--643839153
--401000005
--375562743
--338880820
--335020509
--220639152
--29956167
-12130764
-37535173
-54851252
-82403349
-208615425
-217434353
-336582728
-376601142
-436477023
-489151559
-516580575
-547697212
-624542582
-726934078
-795207835
-998974724
-1134674792
-1146919620
-1338812533
-1392089070
-1553972975
-1564809320
-1595727001
-1601597792
-1622623239
-1703633350
-1735604032
-1845974523
-1866805381
-1889439807
-1927183812
-1952427746
-1991226384
-2076153833
-2124258978
--2099517735
--1825030603
--1549741716
--619166906
--190493968
-332254781
-1216682123
--2070099532
--1810119301
--876602626
--684781893
--412714157
-638005138
-811970555
-1253625085
-1292623463
-1319630511
-1843309410
--353765158
--313185812
-362121710
-466317817
-508859332
-944931209
--778424400
--726869081
-1051418749
-1865529547
-1969653876
-1982125377
-1831309708
--940745510
-1319630510
-1843309409
-1438773293
--811126361
-346507643
-1843309408
-941231896
-336582727
-202777881
-1184281537
--366175320
-364775211
-1807750876
-1876621117
--1059628593
-1841942721
-980458901
-1743340179
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.adm
deleted file mode 100644
index 8b231c5..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-1_2.adm
+++ /dev/null
@@ -1,302 +0,0 @@
--2100346009
--2099271744
--2095729781
--2092234318
--2064380931
--2044228573
--2041394379
--1995931552
--1961708102
--1930672765
--1925061768
--1884800058
--1884722688
--1843785300
--1830483328
--1827399817
--1823572306
--1800928259
--1768694843
--1768045679
--1743779108
--1742028699
--1740509970
--1732505408
--1729705254
--1655516304
--1626188505
--1609006415
--1598505188
--1594487989
--1553380510
--1535341846
--1442878015
--1419814343
--1396219568
--1349551945
--1311409178
--1296587453
--1240806000
--1225430010
--1064858130
--1063109284
--1045566799
--1044558419
--1022590190
--1016071050
--1006350002
--982216652
--975530700
--959052990
--956760709
--915533807
--883971423
--835336873
--822173589
--794144920
--780204151
--777420573
--760580623
--755156292
--743268693
--684781892
--606045019
--570170013
--565948000
--534825744
--523516656
--509449562
--498627020
--466739899
--452599430
--448767586
--434432019
--423176309
--368783024
--364546240
--359166347
--348047278
--312742449
--297504936
--246704257
--241549963
--205768560
--186625582
--180072229
--166827474
--161256337
--159726822
--159089000
--157616828
--132223855
--130046697
--104490550
--30501291
--25268558
--15352091
--4365677
-22917776
-94735359
-99986803
-114154416
-118521833
-202777882
-204805762
-213361009
-235005948
-238725193
-260903781
-277037318
-285049676
-307007687
-329122349
-329859751
-352835028
-364775212
-372271254
-380248390
-382366039
-427003385
-469812361
-481345800
-500833678
-540752742
-544185827
-593160419
-606318607
-610756166
-667333696
-675209541
-690242600
-699979219
-731670499
-797735848
-812584443
-827265626
-860604615
-913801175
-914572729
-980458902
-997867566
-1020946265
-1021364621
-1029604200
-1061886827
-1080617081
-1081527870
-1092992558
-1101732966
-1122042649
-1184281538
-1194310461
-1202560340
-1213966713
-1216682124
-1234142640
-1250804875
-1267820964
-1301392510
-1311122045
-1328804107
-1345028738
-1393258922
-1393904549
-1408073343
-1475217659
-1487581554
-1576421485
-1591147181
-1593768276
-1630132998
-1663722522
-1669137324
-1692834009
-1695382779
-1725807273
-1741263740
-1743340180
-1748224791
-1769943268
-1843219182
-1843309411
-1899428720
-1961904540
-1992104541
-1996585684
-2016705058
-2023897578
-2031126056
-2061814519
-2064356955
-2077568601
-2142119869
--2129148808
--2123306067
--1866357545
--1830272775
--1698686135
--1675097392
--1424260364
--1101893819
--1101893818
--983571329
--928358681
--886125391
--868634819
--820263423
--813973322
--811126360
--672919447
--644628342
--643839153
--401000005
--375562743
--338880820
--335020509
--220639152
--29956167
-12130764
-37535173
-54851252
-82403349
-208615425
-217434353
-336582728
-376601142
-436477023
-489151559
-516580575
-547697212
-624542582
-726934078
-795207835
-998974724
-1134674792
-1146919620
-1338812533
-1392089070
-1553972975
-1564809320
-1595727001
-1601597792
-1622623239
-1703633350
-1735604032
-1845974523
-1866805381
-1889439807
-1927183812
-1952427746
-1991226384
-2076153833
-2124258978
--2099517735
--1825030603
--1549741716
--619166906
--190493968
-332254781
-1216682123
--2070099532
--1810119301
--876602626
--684781893
--412714157
-638005138
-811970555
-1253625085
-1292623463
-1319630511
-1843309410
--353765158
--313185812
-362121710
-466317817
-508859332
-944931209
--778424400
--726869081
-1051418749
-1865529547
-1969653876
-1982125377
-1831309708
--940745510
-1319630510
-1843309409
-1438773293
--811126361
-346507643
-1843309408
-941231896
-336582727
-202777881
-1184281537
--366175320
-364775211
-1807750876
-1876621117
--1059628593
-1841942721
-980458901
-1743340179
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.2.adm
deleted file mode 100644
index e2eb27d..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2.2.adm
+++ /dev/null
@@ -1,442 +0,0 @@
-{ "id": 1, "prefixToken": 138, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 1, "prefixToken": 238, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 1, "prefixToken": 254, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 1, "prefixToken": 271, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 1, "prefixToken": 282, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 1, "prefixToken": 290, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 1, "prefixToken": 292, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "prefixToken": 3, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 2, "prefixToken": 20, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 2, "prefixToken": 25, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 2, "prefixToken": 153, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 2, "prefixToken": 258, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "prefixToken": 229, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 3, "prefixToken": 261, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 3, "prefixToken": 279, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "prefixToken": 28, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 4, "prefixToken": 70, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 4, "prefixToken": 242, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 4, "prefixToken": 257, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "prefixToken": 236, "tokens": [ 236, 294, 297 ] }
-{ "id": 5, "prefixToken": 294, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "prefixToken": 16, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 6, "prefixToken": 60, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 6, "prefixToken": 72, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 6, "prefixToken": 81, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 6, "prefixToken": 131, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 6, "prefixToken": 155, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 6, "prefixToken": 172, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "prefixToken": 260, "tokens": [ 260, 290 ] }
-{ "id": 7, "prefixToken": 290, "tokens": [ 260, 290 ] }
-{ "id": 8, "prefixToken": 58, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 8, "prefixToken": 121, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 8, "prefixToken": 122, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 8, "prefixToken": 133, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 8, "prefixToken": 143, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 8, "prefixToken": 209, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 8, "prefixToken": 258, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "prefixToken": 29, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 9, "prefixToken": 53, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 9, "prefixToken": 77, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "prefixToken": 40, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 10, "prefixToken": 104, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 10, "prefixToken": 220, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 10, "prefixToken": 253, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 10, "prefixToken": 261, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "prefixToken": 43, "tokens": [ 43, 279, 300 ] }
-{ "id": 11, "prefixToken": 279, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "prefixToken": 64, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 12, "prefixToken": 110, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 12, "prefixToken": 196, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 12, "prefixToken": 241, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 12, "prefixToken": 249, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "prefixToken": 21, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 13, "prefixToken": 46, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 13, "prefixToken": 88, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 13, "prefixToken": 294, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 13, "prefixToken": 296, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "prefixToken": 18, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 14, "prefixToken": 51, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 14, "prefixToken": 241, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 14, "prefixToken": 249, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 14, "prefixToken": 280, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "prefixToken": 11, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 15, "prefixToken": 101, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 15, "prefixToken": 136, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 15, "prefixToken": 261, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "prefixToken": 26, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 16, "prefixToken": 114, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 16, "prefixToken": 147, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 16, "prefixToken": 251, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 16, "prefixToken": 292, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 16, "prefixToken": 294, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "prefixToken": 86, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 17, "prefixToken": 245, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 17, "prefixToken": 275, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 17, "prefixToken": 290, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 17, "prefixToken": 294, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "prefixToken": 4, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 18, "prefixToken": 49, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 18, "prefixToken": 137, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 18, "prefixToken": 145, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 18, "prefixToken": 177, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "prefixToken": 175, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 19, "prefixToken": 258, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 19, "prefixToken": 288, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 19, "prefixToken": 291, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "prefixToken": 9, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 20, "prefixToken": 290, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 20, "prefixToken": 296, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "prefixToken": 259, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 21, "prefixToken": 261, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 21, "prefixToken": 263, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "prefixToken": 116, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 22, "prefixToken": 279, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 22, "prefixToken": 293, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 22, "prefixToken": 294, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "prefixToken": 63, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 23, "prefixToken": 265, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 23, "prefixToken": 294, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "prefixToken": 259, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 24, "prefixToken": 263, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 24, "prefixToken": 294, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 24, "prefixToken": 296, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "prefixToken": 31, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 25, "prefixToken": 47, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 25, "prefixToken": 190, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 25, "prefixToken": 204, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "prefixToken": 213, "tokens": [ 213, 240, 270 ] }
-{ "id": 26, "prefixToken": 240, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "prefixToken": 85, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 27, "prefixToken": 213, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 27, "prefixToken": 259, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 27, "prefixToken": 263, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "prefixToken": 33, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 28, "prefixToken": 82, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 28, "prefixToken": 242, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 28, "prefixToken": 279, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "prefixToken": 2, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 29, "prefixToken": 32, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 29, "prefixToken": 146, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 29, "prefixToken": 290, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "prefixToken": 6, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 30, "prefixToken": 267, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 30, "prefixToken": 299, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "prefixToken": 94, "tokens": [ 94, 238 ] }
-{ "id": 31, "prefixToken": 238, "tokens": [ 94, 238 ] }
-{ "id": 32, "prefixToken": 73, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 32, "prefixToken": 165, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 32, "prefixToken": 189, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "prefixToken": 68, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 33, "prefixToken": 244, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 33, "prefixToken": 286, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "prefixToken": 15, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 34, "prefixToken": 34, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 34, "prefixToken": 99, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 34, "prefixToken": 267, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 34, "prefixToken": 294, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "prefixToken": 12, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 35, "prefixToken": 56, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 35, "prefixToken": 107, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 35, "prefixToken": 217, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "prefixToken": 178, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 36, "prefixToken": 201, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 36, "prefixToken": 220, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 36, "prefixToken": 291, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "prefixToken": 108, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 37, "prefixToken": 270, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 37, "prefixToken": 279, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "prefixToken": 30, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 38, "prefixToken": 174, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 38, "prefixToken": 279, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "prefixToken": 103, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 39, "prefixToken": 130, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 39, "prefixToken": 193, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 39, "prefixToken": 260, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 39, "prefixToken": 286, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "prefixToken": 44, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 40, "prefixToken": 128, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 40, "prefixToken": 256, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 40, "prefixToken": 282, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "prefixToken": 48, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 41, "prefixToken": 57, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 41, "prefixToken": 236, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "prefixToken": 90, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 42, "prefixToken": 209, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 42, "prefixToken": 244, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "prefixToken": 69, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 43, "prefixToken": 98, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 43, "prefixToken": 286, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 43, "prefixToken": 293, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 43, "prefixToken": 296, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "prefixToken": 1, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 44, "prefixToken": 202, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 44, "prefixToken": 290, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 44, "prefixToken": 295, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "prefixToken": 67, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 45, "prefixToken": 100, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 45, "prefixToken": 109, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "prefixToken": 23, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 46, "prefixToken": 75, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 46, "prefixToken": 117, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 46, "prefixToken": 118, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 46, "prefixToken": 160, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "prefixToken": 45, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 47, "prefixToken": 54, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 47, "prefixToken": 193, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "prefixToken": 95, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 48, "prefixToken": 113, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 48, "prefixToken": 159, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 48, "prefixToken": 271, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 48, "prefixToken": 273, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "prefixToken": 120, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 49, "prefixToken": 151, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 49, "prefixToken": 162, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 49, "prefixToken": 182, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 49, "prefixToken": 271, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "prefixToken": 5, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 50, "prefixToken": 187, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 50, "prefixToken": 292, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 50, "prefixToken": 293, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "prefixToken": 8, "tokens": [ 8, 91, 294 ] }
-{ "id": 51, "prefixToken": 91, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "prefixToken": 84, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 52, "prefixToken": 89, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 52, "prefixToken": 96, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 52, "prefixToken": 150, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "prefixToken": 166, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 53, "prefixToken": 201, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 53, "prefixToken": 290, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 53, "prefixToken": 296, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "prefixToken": 19, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 54, "prefixToken": 62, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 54, "prefixToken": 87, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 54, "prefixToken": 135, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 54, "prefixToken": 149, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "prefixToken": 78, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 55, "prefixToken": 105, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 55, "prefixToken": 106, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 55, "prefixToken": 191, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "prefixToken": 164, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 56, "prefixToken": 252, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 56, "prefixToken": 273, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "prefixToken": 7, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 57, "prefixToken": 42, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 57, "prefixToken": 296, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "prefixToken": 37, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 58, "prefixToken": 102, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 58, "prefixToken": 179, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 58, "prefixToken": 256, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 58, "prefixToken": 267, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "prefixToken": 17, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 59, "prefixToken": 286, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 59, "prefixToken": 291, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 59, "prefixToken": 296, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "prefixToken": 22, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 60, "prefixToken": 83, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 60, "prefixToken": 224, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "prefixToken": 196, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 61, "prefixToken": 265, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 61, "prefixToken": 281, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 61, "prefixToken": 282, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 61, "prefixToken": 283, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "prefixToken": 125, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 62, "prefixToken": 140, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 62, "prefixToken": 265, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 62, "prefixToken": 275, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 62, "prefixToken": 280, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "prefixToken": 260, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 63, "prefixToken": 262, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 63, "prefixToken": 281, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 63, "prefixToken": 283, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "prefixToken": 224, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 64, "prefixToken": 254, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 64, "prefixToken": 260, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 64, "prefixToken": 282, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "prefixToken": 36, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 65, "prefixToken": 55, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 65, "prefixToken": 221, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 65, "prefixToken": 281, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 65, "prefixToken": 283, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "prefixToken": 111, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 66, "prefixToken": 152, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 66, "prefixToken": 188, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 66, "prefixToken": 265, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 66, "prefixToken": 267, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 66, "prefixToken": 281, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "prefixToken": 79, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 67, "prefixToken": 281, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 67, "prefixToken": 282, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 67, "prefixToken": 283, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "prefixToken": 127, "tokens": [ 127, 161, 184 ] }
-{ "id": 68, "prefixToken": 161, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "prefixToken": 92, "tokens": [ 92 ] }
-{ "id": 70, "prefixToken": 126, "tokens": [ 126, 144, 299 ] }
-{ "id": 70, "prefixToken": 144, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "prefixToken": 14, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 71, "prefixToken": 112, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 71, "prefixToken": 134, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 71, "prefixToken": 169, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 71, "prefixToken": 170, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 71, "prefixToken": 181, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "prefixToken": 39, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 72, "prefixToken": 124, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 72, "prefixToken": 156, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 72, "prefixToken": 168, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "prefixToken": 35, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 73, "prefixToken": 41, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 73, "prefixToken": 272, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 73, "prefixToken": 282, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "prefixToken": 52, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 74, "prefixToken": 65, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 74, "prefixToken": 123, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 74, "prefixToken": 163, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 74, "prefixToken": 171, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 74, "prefixToken": 176, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 74, "prefixToken": 211, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "prefixToken": 240, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 75, "prefixToken": 270, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 75, "prefixToken": 272, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "prefixToken": 129, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 76, "prefixToken": 217, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 76, "prefixToken": 229, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 76, "prefixToken": 263, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 76, "prefixToken": 290, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "prefixToken": 158, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 77, "prefixToken": 271, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 77, "prefixToken": 273, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "prefixToken": 93, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 78, "prefixToken": 115, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 78, "prefixToken": 148, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "prefixToken": 167, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 79, "prefixToken": 186, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 79, "prefixToken": 202, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "prefixToken": 272, "tokens": [ 272 ] }
-{ "id": 81, "prefixToken": 142, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 81, "prefixToken": 197, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 81, "prefixToken": 215, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 81, "prefixToken": 222, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 81, "prefixToken": 226, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 81, "prefixToken": 237, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 197, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 215, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 222, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 226, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 237, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 276, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 82, "prefixToken": 280, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "prefixToken": 255, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 83, "prefixToken": 264, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 83, "prefixToken": 266, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 83, "prefixToken": 268, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 83, "prefixToken": 274, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 83, "prefixToken": 276, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 83, "prefixToken": 277, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 264, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 266, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 268, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 269, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 274, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 276, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 277, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "prefixToken": 278, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "prefixToken": 199, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 85, "prefixToken": 200, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 85, "prefixToken": 205, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 85, "prefixToken": 246, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 85, "prefixToken": 248, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 85, "prefixToken": 272, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 199, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 200, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 219, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 246, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 248, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 262, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "prefixToken": 272, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "prefixToken": 195, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 87, "prefixToken": 250, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 87, "prefixToken": 255, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 87, "prefixToken": 264, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 87, "prefixToken": 266, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 87, "prefixToken": 274, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 87, "prefixToken": 276, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 0, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 195, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 250, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 264, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 266, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 274, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 276, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 88, "prefixToken": 277, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "prefixToken": 194, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 89, "prefixToken": 208, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 89, "prefixToken": 227, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 89, "prefixToken": 232, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 89, "prefixToken": 233, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 10, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 66, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 97, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 139, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 194, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 208, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "prefixToken": 227, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "prefixToken": 203, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 91, "prefixToken": 212, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 91, "prefixToken": 219, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 91, "prefixToken": 225, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 91, "prefixToken": 228, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 91, "prefixToken": 235, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "prefixToken": 203, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 92, "prefixToken": 205, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 92, "prefixToken": 212, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 92, "prefixToken": 225, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 92, "prefixToken": 228, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 92, "prefixToken": 235, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "prefixToken": 24, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 93, "prefixToken": 157, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 93, "prefixToken": 230, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 93, "prefixToken": 252, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "prefixToken": 183, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 94, "prefixToken": 230, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 94, "prefixToken": 252, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "prefixToken": 27, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 80, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 132, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 141, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 192, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 206, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 207, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 210, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 95, "prefixToken": 214, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 61, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 76, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 192, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 206, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 207, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 210, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 214, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 223, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 247, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "prefixToken": 262, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "prefixToken": 198, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 97, "prefixToken": 231, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 97, "prefixToken": 234, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 97, "prefixToken": 253, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 97, "prefixToken": 255, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 97, "prefixToken": 268, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 97, "prefixToken": 269, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 180, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 198, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 231, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 234, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 253, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 268, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 269, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "prefixToken": 277, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "prefixToken": 50, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 99, "prefixToken": 59, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 99, "prefixToken": 71, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 99, "prefixToken": 74, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "prefixToken": 13, "tokens": [ 13, 38, 119, 293, 299 ] }
-{ "id": 100, "prefixToken": 38, "tokens": [ 13, 38, 119, 293, 299 ] }
-{ "id": 100, "prefixToken": 119, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_2.adm
deleted file mode 100644
index 7b38dee..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_2.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "tokens": [ 260, 290 ] }
-{ "id": 8, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "tokens": [ 94, 238 ] }
-{ "id": 32, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "tokens": [ 92 ] }
-{ "id": 70, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "tokens": [ 272 ] }
-{ "id": 81, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_3.adm
deleted file mode 100644
index 7b38dee..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_3.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "tokens": [ 260, 290 ] }
-{ "id": 8, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "tokens": [ 94, 238 ] }
-{ "id": 32, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "tokens": [ 92 ] }
-{ "id": 70, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "tokens": [ 272 ] }
-{ "id": 81, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_4.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_4.adm
deleted file mode 100644
index 7b38dee..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_4.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "tokens": [ 260, 290 ] }
-{ "id": 8, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "tokens": [ 94, 238 ] }
-{ "id": 32, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "tokens": [ 92 ] }
-{ "id": 70, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "tokens": [ 272 ] }
-{ "id": 81, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.2.adm
deleted file mode 100644
index 633fa5b..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.2.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "len": 12, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "len": 9, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "len": 5, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "len": 6, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "len": 3, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "len": 13, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "len": 2, "tokens": [ 260, 290 ] }
-{ "id": 8, "len": 13, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "len": 5, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "len": 8, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "len": 3, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "len": 8, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "len": 8, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "len": 9, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "len": 7, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "len": 10, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "len": 8, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "len": 8, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "len": 6, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "len": 5, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "len": 5, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "len": 6, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "len": 4, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "len": 7, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "len": 6, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "len": 3, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "len": 6, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "len": 6, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "len": 7, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "len": 4, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "len": 2, "tokens": [ 94, 238 ] }
-{ "id": 32, "len": 5, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "len": 5, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "len": 9, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "len": 7, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "len": 7, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "len": 5, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "len": 4, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "len": 9, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "len": 7, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "len": 5, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "len": 5, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "len": 8, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "len": 6, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "len": 5, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "len": 8, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "len": 4, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "len": 8, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "len": 8, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "len": 6, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "len": 3, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "len": 7, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "len": 6, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "len": 9, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "len": 7, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "len": 5, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "len": 5, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "len": 8, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "len": 6, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "len": 4, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "len": 8, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "len": 9, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "len": 7, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "len": 7, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "len": 9, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "len": 10, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "len": 6, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "len": 3, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "len": 1, "tokens": [ 92 ] }
-{ "id": 70, "len": 3, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "len": 11, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "len": 6, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "len": 7, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "len": 12, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "len": 4, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "len": 8, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "len": 4, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "len": 5, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "len": 5, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "len": 1, "tokens": [ 272 ] }
-{ "id": 81, "len": 11, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "len": 12, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "len": 13, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "len": 14, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "len": 11, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "len": 12, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "len": 13, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "len": 15, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "len": 9, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "len": 13, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "len": 11, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "len": 10, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "len": 6, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "len": 5, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "len": 16, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "len": 18, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "len": 13, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "len": 14, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "len": 6, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "len": 5, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.3.adm
deleted file mode 100644
index 633fa5b..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.3.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "len": 12, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "len": 9, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "len": 5, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "len": 6, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "len": 3, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "len": 13, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "len": 2, "tokens": [ 260, 290 ] }
-{ "id": 8, "len": 13, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "len": 5, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "len": 8, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "len": 3, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "len": 8, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "len": 8, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "len": 9, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "len": 7, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "len": 10, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "len": 8, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "len": 8, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "len": 6, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "len": 5, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "len": 5, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "len": 6, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "len": 4, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "len": 7, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "len": 6, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "len": 3, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "len": 6, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "len": 6, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "len": 7, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "len": 4, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "len": 2, "tokens": [ 94, 238 ] }
-{ "id": 32, "len": 5, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "len": 5, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "len": 9, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "len": 7, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "len": 7, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "len": 5, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "len": 4, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "len": 9, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "len": 7, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "len": 5, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "len": 5, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "len": 8, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "len": 6, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "len": 5, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "len": 8, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "len": 4, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "len": 8, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "len": 8, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "len": 6, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "len": 3, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "len": 7, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "len": 6, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "len": 9, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "len": 7, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "len": 5, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "len": 5, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "len": 8, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "len": 6, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "len": 4, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "len": 8, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "len": 9, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "len": 7, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "len": 7, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "len": 9, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "len": 10, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "len": 6, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "len": 3, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "len": 1, "tokens": [ 92 ] }
-{ "id": 70, "len": 3, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "len": 11, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "len": 6, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "len": 7, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "len": 12, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "len": 4, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "len": 8, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "len": 4, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "len": 5, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "len": 5, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "len": 1, "tokens": [ 272 ] }
-{ "id": 81, "len": 11, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "len": 12, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "len": 13, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "len": 14, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "len": 11, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "len": 12, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "len": 13, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "len": 15, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "len": 9, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "len": 13, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "len": 11, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "len": 10, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "len": 6, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "len": 5, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "len": 16, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "len": 18, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "len": 13, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "len": 14, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "len": 6, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "len": 5, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.adm
deleted file mode 100644
index 633fa5b..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-2_5.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "len": 12, "tokens": [ 138, 238, 254, 271, 282, 290, 292, 293, 295, 299, 300, 301 ] }
-{ "id": 2, "len": 9, "tokens": [ 3, 20, 25, 153, 258, 259, 274, 291, 300 ] }
-{ "id": 3, "len": 5, "tokens": [ 229, 261, 279, 294, 298 ] }
-{ "id": 4, "len": 6, "tokens": [ 28, 70, 242, 257, 294, 301 ] }
-{ "id": 5, "len": 3, "tokens": [ 236, 294, 297 ] }
-{ "id": 6, "len": 13, "tokens": [ 16, 60, 72, 81, 131, 155, 172, 185, 216, 275, 292, 296, 300 ] }
-{ "id": 7, "len": 2, "tokens": [ 260, 290 ] }
-{ "id": 8, "len": 13, "tokens": [ 58, 121, 122, 133, 143, 209, 258, 291, 292, 296, 297, 298, 300 ] }
-{ "id": 9, "len": 5, "tokens": [ 29, 53, 77, 154, 295 ] }
-{ "id": 10, "len": 8, "tokens": [ 40, 104, 220, 253, 261, 286, 293, 299 ] }
-{ "id": 11, "len": 3, "tokens": [ 43, 279, 300 ] }
-{ "id": 12, "len": 8, "tokens": [ 64, 110, 196, 241, 249, 283, 288, 297 ] }
-{ "id": 13, "len": 8, "tokens": [ 21, 46, 88, 294, 296, 297, 300, 301 ] }
-{ "id": 14, "len": 9, "tokens": [ 18, 51, 241, 249, 280, 283, 288, 290, 295 ] }
-{ "id": 15, "len": 7, "tokens": [ 11, 101, 136, 261, 275, 294, 298 ] }
-{ "id": 16, "len": 10, "tokens": [ 26, 114, 147, 251, 292, 294, 295, 296, 297, 300 ] }
-{ "id": 17, "len": 8, "tokens": [ 86, 245, 275, 290, 294, 296, 298, 300 ] }
-{ "id": 18, "len": 8, "tokens": [ 4, 49, 137, 145, 177, 270, 288, 299 ] }
-{ "id": 19, "len": 6, "tokens": [ 175, 258, 288, 291, 297, 300 ] }
-{ "id": 20, "len": 5, "tokens": [ 9, 290, 296, 298, 300 ] }
-{ "id": 21, "len": 5, "tokens": [ 259, 261, 263, 294, 298 ] }
-{ "id": 22, "len": 6, "tokens": [ 116, 279, 293, 294, 297, 298 ] }
-{ "id": 23, "len": 4, "tokens": [ 63, 265, 294, 297 ] }
-{ "id": 24, "len": 7, "tokens": [ 259, 263, 294, 296, 297, 298, 300 ] }
-{ "id": 25, "len": 6, "tokens": [ 31, 47, 190, 204, 293, 301 ] }
-{ "id": 26, "len": 3, "tokens": [ 213, 240, 270 ] }
-{ "id": 27, "len": 6, "tokens": [ 85, 213, 259, 263, 270, 301 ] }
-{ "id": 28, "len": 6, "tokens": [ 33, 82, 242, 279, 286, 292 ] }
-{ "id": 29, "len": 7, "tokens": [ 2, 32, 146, 290, 292, 296, 300 ] }
-{ "id": 30, "len": 4, "tokens": [ 6, 267, 299, 300 ] }
-{ "id": 31, "len": 2, "tokens": [ 94, 238 ] }
-{ "id": 32, "len": 5, "tokens": [ 73, 165, 189, 297, 299 ] }
-{ "id": 33, "len": 5, "tokens": [ 68, 244, 286, 293, 299 ] }
-{ "id": 34, "len": 9, "tokens": [ 15, 34, 99, 267, 294, 297, 299, 300, 301 ] }
-{ "id": 35, "len": 7, "tokens": [ 12, 56, 107, 217, 218, 293, 301 ] }
-{ "id": 36, "len": 7, "tokens": [ 178, 201, 220, 291, 296, 298, 300 ] }
-{ "id": 37, "len": 5, "tokens": [ 108, 270, 279, 286, 299 ] }
-{ "id": 38, "len": 4, "tokens": [ 30, 174, 279, 298 ] }
-{ "id": 39, "len": 9, "tokens": [ 103, 130, 193, 260, 286, 292, 295, 299, 300 ] }
-{ "id": 40, "len": 7, "tokens": [ 44, 128, 256, 282, 297, 298, 301 ] }
-{ "id": 41, "len": 5, "tokens": [ 48, 57, 236, 256, 301 ] }
-{ "id": 42, "len": 5, "tokens": [ 90, 209, 244, 293, 299 ] }
-{ "id": 43, "len": 8, "tokens": [ 69, 98, 286, 293, 296, 297, 299, 300 ] }
-{ "id": 44, "len": 6, "tokens": [ 1, 202, 290, 295, 296, 300 ] }
-{ "id": 45, "len": 5, "tokens": [ 67, 100, 109, 296, 300 ] }
-{ "id": 46, "len": 8, "tokens": [ 23, 75, 117, 118, 160, 294, 295, 297 ] }
-{ "id": 47, "len": 4, "tokens": [ 45, 54, 193, 251 ] }
-{ "id": 48, "len": 8, "tokens": [ 95, 113, 159, 271, 273, 296, 299, 300 ] }
-{ "id": 49, "len": 8, "tokens": [ 120, 151, 162, 182, 271, 295, 297, 300 ] }
-{ "id": 50, "len": 6, "tokens": [ 5, 187, 292, 293, 296, 300 ] }
-{ "id": 51, "len": 3, "tokens": [ 8, 91, 294 ] }
-{ "id": 52, "len": 7, "tokens": [ 84, 89, 96, 150, 216, 286, 292 ] }
-{ "id": 53, "len": 6, "tokens": [ 166, 201, 290, 296, 300, 301 ] }
-{ "id": 54, "len": 9, "tokens": [ 19, 62, 87, 135, 149, 245, 292, 293, 299 ] }
-{ "id": 55, "len": 7, "tokens": [ 78, 105, 106, 191, 286, 292, 295 ] }
-{ "id": 56, "len": 5, "tokens": [ 164, 252, 273, 296, 300 ] }
-{ "id": 57, "len": 5, "tokens": [ 7, 42, 296, 298, 300 ] }
-{ "id": 58, "len": 8, "tokens": [ 37, 102, 179, 256, 267, 292, 293, 295 ] }
-{ "id": 59, "len": 6, "tokens": [ 17, 286, 291, 296, 297, 300 ] }
-{ "id": 60, "len": 4, "tokens": [ 22, 83, 224, 299 ] }
-{ "id": 61, "len": 8, "tokens": [ 196, 265, 281, 282, 283, 288, 293, 294 ] }
-{ "id": 62, "len": 9, "tokens": [ 125, 140, 265, 275, 280, 281, 283, 288, 294 ] }
-{ "id": 63, "len": 7, "tokens": [ 260, 262, 281, 283, 288, 294, 297 ] }
-{ "id": 64, "len": 7, "tokens": [ 224, 254, 260, 282, 293, 299, 301 ] }
-{ "id": 65, "len": 9, "tokens": [ 36, 55, 221, 281, 283, 288, 294, 295, 297 ] }
-{ "id": 66, "len": 10, "tokens": [ 111, 152, 188, 265, 267, 281, 283, 288, 295, 299 ] }
-{ "id": 67, "len": 6, "tokens": [ 79, 281, 282, 283, 288, 297 ] }
-{ "id": 68, "len": 3, "tokens": [ 127, 161, 184 ] }
-{ "id": 69, "len": 1, "tokens": [ 92 ] }
-{ "id": 70, "len": 3, "tokens": [ 126, 144, 299 ] }
-{ "id": 71, "len": 11, "tokens": [ 14, 112, 134, 169, 170, 181, 254, 282, 292, 293, 301 ] }
-{ "id": 72, "len": 6, "tokens": [ 39, 124, 156, 168, 173, 221 ] }
-{ "id": 73, "len": 7, "tokens": [ 35, 41, 272, 282, 293, 299, 301 ] }
-{ "id": 74, "len": 12, "tokens": [ 52, 65, 123, 163, 171, 176, 211, 271, 294, 295, 299, 301 ] }
-{ "id": 75, "len": 4, "tokens": [ 240, 270, 272, 301 ] }
-{ "id": 76, "len": 8, "tokens": [ 129, 217, 229, 263, 290, 291, 296, 301 ] }
-{ "id": 77, "len": 4, "tokens": [ 158, 271, 273, 299 ] }
-{ "id": 78, "len": 5, "tokens": [ 93, 115, 148, 204, 299 ] }
-{ "id": 79, "len": 5, "tokens": [ 167, 186, 202, 211, 301 ] }
-{ "id": 80, "len": 1, "tokens": [ 272 ] }
-{ "id": 81, "len": 11, "tokens": [ 142, 197, 215, 222, 226, 237, 276, 285, 287, 289, 298 ] }
-{ "id": 82, "len": 12, "tokens": [ 197, 215, 222, 226, 237, 276, 280, 284, 285, 287, 289, 298 ] }
-{ "id": 83, "len": 13, "tokens": [ 255, 264, 266, 268, 274, 276, 277, 278, 284, 285, 287, 289, 292 ] }
-{ "id": 84, "len": 14, "tokens": [ 264, 266, 268, 269, 274, 276, 277, 278, 280, 284, 285, 287, 289, 292 ] }
-{ "id": 85, "len": 11, "tokens": [ 199, 200, 205, 246, 248, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 86, "len": 12, "tokens": [ 199, 200, 219, 246, 248, 262, 272, 273, 278, 295, 298, 301 ] }
-{ "id": 87, "len": 13, "tokens": [ 195, 250, 255, 264, 266, 274, 276, 277, 278, 284, 287, 289, 291 ] }
-{ "id": 88, "len": 15, "tokens": [ 0, 195, 250, 264, 266, 274, 276, 277, 278, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 89, "len": 9, "tokens": [ 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 90, "len": 13, "tokens": [ 10, 66, 97, 139, 194, 208, 227, 232, 233, 243, 257, 290, 301 ] }
-{ "id": 91, "len": 11, "tokens": [ 203, 212, 219, 225, 228, 235, 239, 262, 295, 298, 301 ] }
-{ "id": 92, "len": 10, "tokens": [ 203, 205, 212, 225, 228, 235, 239, 295, 298, 301 ] }
-{ "id": 93, "len": 6, "tokens": [ 24, 157, 230, 252, 293, 298 ] }
-{ "id": 94, "len": 5, "tokens": [ 183, 230, 252, 275, 298 ] }
-{ "id": 95, "len": 16, "tokens": [ 27, 80, 132, 141, 192, 206, 207, 210, 214, 223, 247, 287, 289, 291, 295, 301 ] }
-{ "id": 96, "len": 18, "tokens": [ 61, 76, 192, 206, 207, 210, 214, 223, 247, 262, 269, 284, 285, 287, 289, 291, 295, 301 ] }
-{ "id": 97, "len": 13, "tokens": [ 198, 231, 234, 253, 255, 268, 269, 277, 284, 285, 287, 289, 291 ] }
-{ "id": 98, "len": 14, "tokens": [ 180, 198, 231, 234, 253, 268, 269, 277, 280, 284, 285, 287, 289, 291 ] }
-{ "id": 99, "len": 6, "tokens": [ 50, 59, 71, 74, 218, 301 ] }
-{ "id": 100, "len": 5, "tokens": [ 13, 38, 119, 293, 299 ] }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.2.adm
deleted file mode 100644
index a10e906..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.2.adm
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "left": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "right": { "id": 24, "dblpid": "books/acm/kim95/OzsuB95", "title": "Query Processing in Object-Oriented Database Systems.", "authors": "M. Tamer Özsu José A. Blakeley", "misc": "2002-01-03 146-174 1995 Modern Database Systems db/books/collections/kim95.html#OzsuB95" }, "sim": 0.5f }
-{ "left": { "id": 81, "dblpid": "journals/siamcomp/AspnesW96", "title": "Randomized Consensus in Expected O(n log² n) Operations Per Processor.", "authors": "James Aspnes Orli Waarts", "misc": "2002-01-03 1024-1044 1996 25 SIAM J. Comput. 5 db/journals/siamcomp/siamcomp25.html#AspnesW96" }, "right": { "id": 82, "dblpid": "conf/focs/AspnesW92", "title": "Randomized Consensus in Expected O(n log ^2 n) Operations Per Processor", "authors": "James Aspnes Orli Waarts", "misc": "2006-04-25 137-146 conf/focs/FOCS33 1992 FOCS db/conf/focs/focs92.html#AspnesW92" }, "sim": 0.7692308f }
-{ "left": { "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }, "right": { "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }, "sim": 0.8f }
-{ "left": { "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }, "right": { "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }, "sim": 0.625f }
-{ "left": { "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }, "right": { "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }, "sim": 0.5555556f }
-{ "left": { "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }, "right": { "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }, "sim": 0.5f }
-{ "left": { "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }, "right": { "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }, "sim": 0.6111111f }
-{ "left": { "id": 85, "dblpid": "journals/siamcomp/Megiddo83a", "title": "Linear-Time Algorithms for Linear Programming in R³ and Related Problems.", "authors": "Nimrod Megiddo", "misc": "2002-01-03 759-776 1983 12 SIAM J. Comput. 4 db/journals/siamcomp/siamcomp12.html#Megiddo83a" }, "right": { "id": 86, "dblpid": "conf/focs/Megiddo82", "title": "Linear-Time Algorithms for Linear Programming in R^3 and Related Problems", "authors": "Nimrod Megiddo", "misc": "2006-04-25 329-338 conf/focs/FOCS23 1982 FOCS db/conf/focs/focs82.html#Megiddo82" }, "sim": 0.7692308f }
-{ "left": { "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }, "right": { "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }, "sim": 0.75f }
-{ "left": { "id": 89, "dblpid": "conf/icip/SchonfeldL98", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-11-05 123-127 1998 ICIP (3) db/conf/icip/icip1998-3.html#SchonfeldL98" }, "right": { "id": 90, "dblpid": "conf/hicss/SchonfeldL99", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases ¾ Visual Search Engine.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-01-03 1999 HICSS http //computer.org/proceedings/hicss/0001/00013/00013006abs.htm db/conf/hicss/hicss1999-3.html#SchonfeldL99" }, "sim": 0.6923077f }
-{ "left": { "id": 91, "dblpid": "journals/corr/abs-0802-2861", "title": "Geometric Set Cover and Hitting Sets for Polytopes in $R^3$", "authors": "Sören Laue", "misc": "2008-03-03 http //arxiv.org/abs/0802.2861 2008 CoRR abs/0802.2861 db/journals/corr/corr0802.html#abs-0802-2861 informal publication" }, "right": { "id": 92, "dblpid": "conf/stacs/Laue08", "title": "Geometric Set Cover and Hitting Sets for Polytopes in R³.", "authors": "Sören Laue", "misc": "2008-03-04 2008 STACS 479-490 http //drops.dagstuhl.de/opus/volltexte/2008/1367 conf/stacs/2008 db/conf/stacs/stacs2008.html#Laue08" }, "sim": 0.75f }
-{ "left": { "id": 95, "dblpid": "journals/jacm/GalilHLSW87", "title": "An O(n³log n) deterministic and an O(n³) Las Vegs isomorphism test for trivalent graphs.", "authors": "Zvi Galil Christoph M. Hoffmann Eugene M. Luks Claus-Peter Schnorr Andreas Weber", "misc": "2003-11-20 513-531 1987 34 J. ACM 3 http //doi.acm.org/10.1145/28869.28870 db/journals/jacm/jacm34.html#GalilHLSW87" }, "right": { "id": 96, "dblpid": "conf/focs/GalilHLSW82", "title": "An O(n^3 log n) Deterministic and an O(n^3) Probabilistic Isomorphism Test for Trivalent Graphs", "authors": "Zvi Galil Christoph M. Hoffmann Eugene M. Luks Claus-Peter Schnorr Andreas Weber", "misc": "2006-04-25 118-125 conf/focs/FOCS23 1982 FOCS db/conf/focs/focs82.html#GalilHLSW82" }, "sim": 0.54545456f }
-{ "left": { "id": 97, "dblpid": "journals/jacm/GalilT88", "title": "An O(n²(m + n log n)log n) min-cost flow algorithm.", "authors": "Zvi Galil Éva Tardos", "misc": "2003-11-20 374-386 1988 35 J. ACM 2 http //doi.acm.org/10.1145/42282.214090 db/journals/jacm/jacm35.html#GalilT88" }, "right": { "id": 98, "dblpid": "conf/focs/GalilT86", "title": "An O(n^2 (m + n log n) log n) Min-Cost Flow Algorithm", "authors": "Zvi Galil Éva Tardos", "misc": "2006-04-25 1-9 conf/focs/FOCS27 1986 FOCS db/conf/focs/focs86.html#GalilT86" }, "sim": 0.8f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.adm
deleted file mode 100644
index a10e906..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-3_1.adm
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "left": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "right": { "id": 24, "dblpid": "books/acm/kim95/OzsuB95", "title": "Query Processing in Object-Oriented Database Systems.", "authors": "M. Tamer Özsu José A. Blakeley", "misc": "2002-01-03 146-174 1995 Modern Database Systems db/books/collections/kim95.html#OzsuB95" }, "sim": 0.5f }
-{ "left": { "id": 81, "dblpid": "journals/siamcomp/AspnesW96", "title": "Randomized Consensus in Expected O(n log² n) Operations Per Processor.", "authors": "James Aspnes Orli Waarts", "misc": "2002-01-03 1024-1044 1996 25 SIAM J. Comput. 5 db/journals/siamcomp/siamcomp25.html#AspnesW96" }, "right": { "id": 82, "dblpid": "conf/focs/AspnesW92", "title": "Randomized Consensus in Expected O(n log ^2 n) Operations Per Processor", "authors": "James Aspnes Orli Waarts", "misc": "2006-04-25 137-146 conf/focs/FOCS33 1992 FOCS db/conf/focs/focs92.html#AspnesW92" }, "sim": 0.7692308f }
-{ "left": { "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }, "right": { "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }, "sim": 0.8f }
-{ "left": { "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }, "right": { "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }, "sim": 0.625f }
-{ "left": { "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }, "right": { "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }, "sim": 0.5555556f }
-{ "left": { "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }, "right": { "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }, "sim": 0.5f }
-{ "left": { "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }, "right": { "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }, "sim": 0.6111111f }
-{ "left": { "id": 85, "dblpid": "journals/siamcomp/Megiddo83a", "title": "Linear-Time Algorithms for Linear Programming in R³ and Related Problems.", "authors": "Nimrod Megiddo", "misc": "2002-01-03 759-776 1983 12 SIAM J. Comput. 4 db/journals/siamcomp/siamcomp12.html#Megiddo83a" }, "right": { "id": 86, "dblpid": "conf/focs/Megiddo82", "title": "Linear-Time Algorithms for Linear Programming in R^3 and Related Problems", "authors": "Nimrod Megiddo", "misc": "2006-04-25 329-338 conf/focs/FOCS23 1982 FOCS db/conf/focs/focs82.html#Megiddo82" }, "sim": 0.7692308f }
-{ "left": { "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }, "right": { "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }, "sim": 0.75f }
-{ "left": { "id": 89, "dblpid": "conf/icip/SchonfeldL98", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-11-05 123-127 1998 ICIP (3) db/conf/icip/icip1998-3.html#SchonfeldL98" }, "right": { "id": 90, "dblpid": "conf/hicss/SchonfeldL99", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases ¾ Visual Search Engine.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-01-03 1999 HICSS http //computer.org/proceedings/hicss/0001/00013/00013006abs.htm db/conf/hicss/hicss1999-3.html#SchonfeldL99" }, "sim": 0.6923077f }
-{ "left": { "id": 91, "dblpid": "journals/corr/abs-0802-2861", "title": "Geometric Set Cover and Hitting Sets for Polytopes in $R^3$", "authors": "Sören Laue", "misc": "2008-03-03 http //arxiv.org/abs/0802.2861 2008 CoRR abs/0802.2861 db/journals/corr/corr0802.html#abs-0802-2861 informal publication" }, "right": { "id": 92, "dblpid": "conf/stacs/Laue08", "title": "Geometric Set Cover and Hitting Sets for Polytopes in R³.", "authors": "Sören Laue", "misc": "2008-03-04 2008 STACS 479-490 http //drops.dagstuhl.de/opus/volltexte/2008/1367 conf/stacs/2008 db/conf/stacs/stacs2008.html#Laue08" }, "sim": 0.75f }
-{ "left": { "id": 95, "dblpid": "journals/jacm/GalilHLSW87", "title": "An O(n³log n) deterministic and an O(n³) Las Vegs isomorphism test for trivalent graphs.", "authors": "Zvi Galil Christoph M. Hoffmann Eugene M. Luks Claus-Peter Schnorr Andreas Weber", "misc": "2003-11-20 513-531 1987 34 J. ACM 3 http //doi.acm.org/10.1145/28869.28870 db/journals/jacm/jacm34.html#GalilHLSW87" }, "right": { "id": 96, "dblpid": "conf/focs/GalilHLSW82", "title": "An O(n^3 log n) Deterministic and an O(n^3) Probabilistic Isomorphism Test for Trivalent Graphs", "authors": "Zvi Galil Christoph M. Hoffmann Eugene M. Luks Claus-Peter Schnorr Andreas Weber", "misc": "2006-04-25 118-125 conf/focs/FOCS23 1982 FOCS db/conf/focs/focs82.html#GalilHLSW82" }, "sim": 0.54545456f }
-{ "left": { "id": 97, "dblpid": "journals/jacm/GalilT88", "title": "An O(n²(m + n log n)log n) min-cost flow algorithm.", "authors": "Zvi Galil Éva Tardos", "misc": "2003-11-20 374-386 1988 35 J. ACM 2 http //doi.acm.org/10.1145/42282.214090 db/journals/jacm/jacm35.html#GalilT88" }, "right": { "id": 98, "dblpid": "conf/focs/GalilT86", "title": "An O(n^2 (m + n log n) log n) Min-Cost Flow Algorithm", "authors": "Zvi Galil Éva Tardos", "misc": "2006-04-25 1-9 conf/focs/FOCS27 1986 FOCS db/conf/focs/focs86.html#GalilT86" }, "sim": 0.8f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_1.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_1.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_2.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_2.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_3.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_3.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_4.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_4.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_4.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.2.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.2.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.3.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.adm
deleted file mode 100644
index 4e903d1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-2_5.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "idDBLP": 1, "idCSX": 1, "sim": 1.0f }
-{ "idDBLP": 5, "idCSX": 98, "sim": 1.0f }
-{ "idDBLP": 21, "idCSX": 89, "sim": 0.5f }
-{ "idDBLP": 25, "idCSX": 88, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 92, "sim": 1.0f }
-{ "idDBLP": 51, "idCSX": 93, "sim": 1.0f }
-{ "idDBLP": 54, "idCSX": 91, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_2.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_2.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_3.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_3.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_4.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_4.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_4.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.2.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.2.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.3.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.4.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.adm
deleted file mode 100644
index 256ab3a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-3_5.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 0.5f }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." }, "sim": 1.0f }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_2.adm
deleted file mode 100644
index 9e9c6d4..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_2.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_3.adm
deleted file mode 100644
index 9e9c6d4..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-csx-aqlplus_3.adm
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "dblp": { "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }, "csx": { "id": 1, "csxid": "oai CiteSeerXPSU 10.1.1.39.1830", "title": "Object SQL - A Language for the Design and Implementation of Object Databases", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Dan Fishman Mike Heytens William Kent", "misc": "2009-04-13 ly, a function application expression consists of two expressions  a function reference (labelled func_ref in Figure 3 line 2), and an argument (labelled arg). The func_ref expression evaluates to a (generic or specific) function identifier, which may be the same as the function that the expression is a part of, thus allowing recursive function invocations. The expression labelled arg evaluates to an arbitrary object or aggregate object. The semantics of evaluating function applications was discussed in detail in section 2. For example, to set the name of a person, we evaluate the following expression   FunAssign(function name.person) (p1,'John')  In this example, the first expression is itself a function call, applying the function FunAssign to the function name.person (an example of a specific function reference). This returns the oid of the function that sets a person's name, which is subsequently applied to a tuple of two elements, the oid of the person and the new name (a string o... CiteSeerX ACM Press 2009-04-13 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.39.1830 http //www.tu-chemnitz.de/~igrdb/docs/OpenODB/osql.ps.gz en 10.1.1.31.2534 10.1.1.28.4658 10.1.1.44.5947 10.1.1.39.199 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }, "csx": { "id": 98, "csxid": "oai CiteSeerXPSU 10.1.1.49.2910", "title": "Active Database Systems", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2009-04-12 In Won Kim editor Modern Database Systems The Object Model Integrating a production rules facility into a database system provides a uniform mechanism for a number of advanced database features including integrity constraint enforcement, derived data maintenance, triggers, alerters, protection, version control, and others. In addition, a database system with rule processing capabilities provides a useful platform for large and efficient knowledge-base and expert systems. Database systems with production rules are referred to as active database systems, and the field of active database systems has indeed been active. This chapter summarizes current work in active database systems  topics covered include active database rule models and languages, rule execution semantics, and implementation issues.  1 Introduction  Conventional database systems are passive  they only execute queries or transactions explicitly submitted by a user or an application program. For many applications, however, it is important to monitor situations of interest, and to ... CiteSeerX ACM Press 2009-04-12 2007-11-22 1994 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2910 http //www-db.stanford.edu/pub/papers/book-chapter.ps en 10.1.1.17.1323 10.1.1.143.7196 10.1.1.50.3821 10.1.1.51.9946 10.1.1.41.2030 10.1.1.46.2504 10.1.1.52.4421 10.1.1.38.2083 10.1.1.34.661 10.1.1.103.7630 10.1.1.100.9015 10.1.1.97.1699 10.1.1.107.4220 10.1.1.47.9217 10.1.1.133.7157 10.1.1.101.5051 10.1.1.30.9989 10.1.1.53.6941 10.1.1.50.8529 10.1.1.133.4287 10.1.1.50.7278 10.1.1.10.1688 10.1.1.19.8669 10.1.1.44.7600 10.1.1.144.376 10.1.1.44.1348 10.1.1.47.9998 10.1.1.90.4428 10.1.1.108.344 10.1.1.48.9470 10.1.1.53.5472 10.1.1.52.4872 10.1.1.144.4965 10.1.1.31.7578 10.1.1.32.6426 10.1.1.58.6335 10.1.1.85.8052 10.1.1.93.1931 10.1.1.55.4610 10.1.1.21.3821 10.1.1.26.9208 10.1.1.31.4869 10.1.1.48.1833 10.1.1.83.8628 10.1.1.87.9318 10.1.1.90.2195 10.1.1.36.5184 10.1.1.21.1704 10.1.1.53.1733 10.1.1.90.3181 10.1.1.53.6783 10.1.1.52.6151 10.1.1.104.6911 10.1.1.105.1691 10.1.1.21.1984 10.1.1.23.2775 10.1.1.62.5556 10.1.1.68.9063 10.1.1.74.4746 10.1.1.78.5097 10.1.1.84.743 10.1.1.84.904 10.1.1.87.6019 10.1.1.88.3907 10.1.1.89.9631 10.1.1.90.4147 10.1.1.92.365 10.1.1.100.2747 10.1.1.98.5083 10.1.1.98.6663 10.1.1.99.1894 10.1.1.99.8174 10.1.1.133.8073 10.1.1.52.7823 10.1.1.39.5341 10.1.1.35.3458 10.1.1.26.4620 10.1.1.18.8936 10.1.1.19.3694 10.1.1.12.631 10.1.1.48.6394 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }, "csx": { "id": 89, "csxid": "oai CiteSeerXPSU 10.1.1.33.8596", "title": "Dynamic Query Optimization and Query Processing in Multidatabase Systems 1.", "authors": "Henryk Josinski", "misc": "2009-04-15 Introduction  The multidatabase system (MDBS) approach, as a solution for integrated access to information distributed among diverse data sources, has gained a lot of attention in recent years. The multidatabase system is a database system which integrates pre--existing databases allowing the users to access simultaneously database systems (DBMSs) formulating a global query based on a global schema.  The component DBMSs are assumed to be heterogeneous and autonomous. Heterogeneity refers to different user interfaces, data models, query languages, and query optimization strategies [5]. Local autonomy means that each DBMS retains complete control over local data and processing. As result of this, its cost model may not be available to the global query optimizer.  When a global query is submitted, it is decomposed into two types of queries [1]   -- subqueries, operating on sharable data items from local databases,  -- assembling queries, consisting of, CiteSeerX  2009-04-15 2007-11-22 2000 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.33.8596 http //www.edbt2000.uni-konstanz.de/phd-workshop/papers/Josinski.pdf en 10.1.1.27.4704 10.1.1.51.8352 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }, "csx": { "id": 88, "csxid": "oai CiteSeerXPSU 10.1.1.43.3839", "title": "Specification and Execution of Transactional Workflows", "authors": "Marek Rusinkiewicz Amit Sheth", "misc": "2009-04-13 The basic transaction model has evolved over time to incorporate more complex transaction structures  and to selectively modify the atomicity and isolation properties. In this chapter we discuss the application  of transaction concepts to activities that involve coordinated execution of multiple tasks (possibly of  different types) over different processing entities. Such applications are referred to as transactional  workflows. In this chapter we discuss the specification of such workflows and the issues involved in their  execution.  1 What is a Workflow?  Workflows are activities involving the coordinated execution of multiple tasks performed by different processing entities. A task defines some work to be done and can be specified in a number of ways, including a textual description in a file or an email, a form, a message, or a computer program. A processing entity that performs the tasks may be a person or a software system (e.g., a mailer, an application program, a database mana... CiteSeerX ACM Press 2009-04-13 2007-11-22 1995 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.43.3839 http //lsdis.cs.uga.edu/lib/././download/RS93.ps en 10.1.1.17.1323 10.1.1.59.5051 10.1.1.38.6210 10.1.1.68.7445 10.1.1.109.5175 10.1.1.17.7962 10.1.1.44.7778 10.1.1.112.244 10.1.1.13.7602 10.1.1.102.7874 10.1.1.41.4043 10.1.1.49.5143 10.1.1.41.7252 10.1.1.17.3225 10.1.1.54.7761 10.1.1.55.5255 10.1.1.108.958 10.1.1.35.7733 10.1.1.52.3682 10.1.1.36.1618 10.1.1.45.6317 10.1.1.43.3180 10.1.1.35.8718 10.1.1.44.6365 10.1.1.51.2883 10.1.1.50.9206 10.1.1.6.9085 10.1.1.30.1707 10.1.1.80.6634 10.1.1.49.355 10.1.1.127.3550 10.1.1.35.3562 10.1.1.137.8832 10.1.1.49.4085 10.1.1.41.5506 10.1.1.40.4657 10.1.1.43.2369 10.1.1.40.832 10.1.1.74.5411 10.1.1.90.4428 10.1.1.110.6967 10.1.1.27.2122 10.1.1.15.5605 10.1.1.54.727 10.1.1.49.7512 10.1.1.45.8796 10.1.1.50.5984 10.1.1.53.137 10.1.1.30.3262 10.1.1.28.1680 10.1.1.21.7110 10.1.1.29.3148 10.1.1.57.687 10.1.1.59.5924 10.1.1.46.2812 10.1.1.51.5552 10.1.1.17.7375 10.1.1.40.1598 10.1.1.52.9787 10.1.1.1.3496 10.1.1.50.6791 10.1.1.55.3358 10.1.1.137.7582 10.1.1.118.4127 10.1.1.49.3580 10.1.1.35.5825 10.1.1.46.9382 10.1.1.31.7411 10.1.1.48.5504 10.1.1.55.5163 10.1.1.18.1603 10.1.1.52.8129 10.1.1.1.9723 10.1.1.21.9113 10.1.1.49.7644 10.1.1.52.6646 10.1.1.75.3106 10.1.1.80.2072 10.1.1.55.8770 10.1.1.54.8188 10.1.1.101.7919 10.1.1.104.8176 10.1.1.24.5741 10.1.1.29.4667 10.1.1.4.1055 10.1.1.48.9175 10.1.1.56.792 10.1.1.65.3172 10.1.1.66.5947 10.1.1.73.8532 10.1.1.83.8299 10.1.1.86.8521 10.1.1.87.2402 10.1.1.87.4648 10.1.1.90.5638 10.1.1.91.1709 10.1.1.94.4248 10.1.1.114.511 10.1.1.119.5037 10.1.1.124.7957 10.1.1.49.215 10.1.1.53.7777 10.1.1.53.9711 10.1.1.45.9409 10.1.1.40.8789 10.1.1.43.4845 10.1.1.34.8273 10.1.1.35.4783 10.1.1.28.3176 10.1.1.16.8151 10.1.1.8.9117 10.1.1.58.3449 10.1.1.142.7041 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 92, "csxid": "oai CiteSeerXPSU 10.1.1.13.2374", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-17 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of o#ce information systems  it is costly and di#cult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"o#ce objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to o#ce software. In order to fully exploit the approach to achieve integrated o#ce systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments.  We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt to enhance productivity through, f CiteSeerX  2009-04-17 2007-11-21 1988 application/pdf text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.13.2374 http //www.iam.unibe.ch/~scg/Archive/OSG/Nier89bIntegOfficeSystems.pdf en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }, "csx": { "id": 93, "csxid": "oai CiteSeerXPSU 10.1.1.42.9253", "title": "Integrated Office Systems", "authors": "O. M. Nierstrasz D. C. Tsichritzis", "misc": "2009-04-11 Introduction  New techniques are sorely needed to aid in the development and maintenance of large application systems. The problem with traditional approaches to software engineering is well in evidence in the field of office information systems  it is costly and difficult to extend existing applications, and to get unrelated applications to \"talk\" to each other. The objectoriented approach is already being tentatively applied in the modeling of \"office objects\" and in the presentation of these entities to users as such in \"desktop\" interfaces to office software. In order to fully exploit the approach to achieve integrated office systems, we need to use object-oriented programming languages, object-oriented run-time support, and object-oriented software engineering environments. We can view the fundamental idea behind the object-oriented approach as that of encapsulation  object-oriented languages and systems exploit encapsulation in various ways in an attempt t CiteSeerX ACM Press and Addison-Wesley 2009-04-11 2007-11-22 1988 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.9253 ftp //ftp.iam.unibe.ch/pub/scg/Papers/integratedOfficeSystems.ps.gz en 10.1.1.26.9545 10.1.1.65.5865 10.1.1.34.624 10.1.1.12.8544 10.1.1.144.6983 10.1.1.26.6746 10.1.1.49.3064 10.1.1.30.4607 10.1.1.38.4894 10.1.1.20.8197 10.1.1.26.4381 10.1.1.29.1890 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
-{ "dblp": { "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }, "csx": { "id": 91, "csxid": "oai CiteSeerXPSU 10.1.1.55.482", "title": "A Shared View of Sharing  The Treaty of Orlando", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2009-04-12 Introduction For the past few years, researchers have been debating the relative merits of object-oriented languages with classes and inheritance as opposed to those with prototypes and delegation. It has become clear that the object-oriented programming language design space is not a dichotomy. Instead, we have identified two fundamental mechanisms---templates and  empathy---and several different independent degrees of freedom for each. Templates create new objects in their own image, providing guarantees about the similarity of group members. Empathy allows an object to act as if it were some other object, thus providing sharing of state and behavior. The Smalltalk-80  TM  language,  1  Actors, Lieberman's Delegation  system, Self, and Hybrid each take differing stands on the forms of templates  1  Smalltalk-80  TM  is a trademark of Par CiteSeerX ACM Press 2009-04-12 2007-11-22 1989 application/postscript text http //citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.482 http //lcs.www.media.mit.edu/people/lieber/Lieberary/OOP/Treaty/Treaty.ps en 10.1.1.26.9545 10.1.1.118.6579 10.1.1.48.69 10.1.1.57.5195 10.1.1.9.570 10.1.1.47.511 10.1.1.127.5320 10.1.1.100.4334 10.1.1.5.3348 10.1.1.39.3374 10.1.1.56.4713 10.1.1.61.2065 10.1.1.27.3015 10.1.1.1.5960 10.1.1.67.5433 10.1.1.31.8109 10.1.1.68.4062 10.1.1.49.3986 10.1.1.122.9331 10.1.1.46.8283 10.1.1.54.5230 10.1.1.16.2055 10.1.1.137.5180 10.1.1.43.5722 10.1.1.68.2105 10.1.1.35.1247 10.1.1.30.1415 10.1.1.7.5014 10.1.1.102.3946 10.1.1.105.6469 10.1.1.26.223 10.1.1.26.8645 10.1.1.35.4104 10.1.1.39.6986 10.1.1.41.7822 10.1.1.42.9056 10.1.1.53.9325 10.1.1.71.1802 10.1.1.76.6993 10.1.1.89.9613 10.1.1.121.5599 10.1.1.122.3737 10.1.1.127.1894 10.1.1.55.5674 10.1.1.37.8260 10.1.1.2.2077 10.1.1.24.5782 10.1.1.19.780 10.1.1.2.4148 10.1.1.2.4173 10.1.1.131.902 10.1.1.30.2927 Metadata may be used without restrictions as long as the oai identifier remains attached to it." } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/events-users-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/events-users-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/tmp-1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/tmp-1/tmp-1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/tmp-1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/tmp-1/tmp-1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_2.adm
deleted file mode 100644
index f61e1c3..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_2.adm
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "user2": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 100, "name": "Curt Savage", "lottery_numbers": [ 47, 50, 53 ], "interests": {{ "singing", "painting", "biking" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "user2": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} }, "user2": { "uid": 100, "name": "Curt Savage", "lottery_numbers": [ 47, 50, 53 ], "interests": {{ "singing", "painting", "biking" }} } }
-{ "user": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} }, "user2": { "uid": 100, "name": "Curt Savage", "lottery_numbers": [ 47, 50, 53 ], "interests": {{ "singing", "painting", "biking" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_3.adm
deleted file mode 100644
index f61e1c3..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_3.adm
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "user2": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 100, "name": "Curt Savage", "lottery_numbers": [ 47, 50, 53 ], "interests": {{ "singing", "painting", "biking" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "user2": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} }, "user2": { "uid": 100, "name": "Curt Savage", "lottery_numbers": [ 47, 50, 53 ], "interests": {{ "singing", "painting", "biking" }} } }
-{ "user": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} }, "user2": { "uid": 100, "name": "Curt Savage", "lottery_numbers": [ 47, 50, 53 ], "interests": {{ "singing", "painting", "biking" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_2.adm
deleted file mode 100644
index 814df80..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_2.adm
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "user2": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "user2": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 90, "name": "Myrtice Cubias", "lottery_numbers": [ 20, 25, 43 ], "interests": {{ "kayaking", "running" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "user2": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_3.adm
deleted file mode 100644
index 814df80..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_3.adm
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "user2": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "user2": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "user2": { "uid": 90, "name": "Myrtice Cubias", "lottery_numbers": [ 20, 25, 43 ], "interests": {{ "kayaking", "running" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "user2": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-3_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-3_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_2.adm
deleted file mode 100644
index 693874d..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_2.adm
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1060, "name": "Mckenzie Neitzke", "lottery_numbers": [  ], "interests": {{ "hiking", "biking", "swimming" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1050, "name": "Harold Pendelton", "lottery_numbers": [ 10, 12, 15 ], "interests": {{ "singing", "acting" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1090, "name": "Jackson Fillerup", "lottery_numbers": [ 25, 30, 35 ], "interests": {{ "acting", "singing" }} } }
-{ "user": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1060, "name": "Mckenzie Neitzke", "lottery_numbers": [  ], "interests": {{ "hiking", "biking", "swimming" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_3.adm
deleted file mode 100644
index 693874d..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_3.adm
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1060, "name": "Mckenzie Neitzke", "lottery_numbers": [  ], "interests": {{ "hiking", "biking", "swimming" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1050, "name": "Harold Pendelton", "lottery_numbers": [ 10, 12, 15 ], "interests": {{ "singing", "acting" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1090, "name": "Jackson Fillerup", "lottery_numbers": [ 25, 30, 35 ], "interests": {{ "acting", "singing" }} } }
-{ "user": { "uid": 50, "name": "Lance Pracht", "lottery_numbers": [ 10, 20, 41 ], "interests": {{ "biking", "acting", "painting" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1060, "name": "Mckenzie Neitzke", "lottery_numbers": [  ], "interests": {{ "hiking", "biking", "swimming" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-3_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-3_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_2.adm
deleted file mode 100644
index 2b94840..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_2.adm
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1050, "name": "Harold Pendelton", "lottery_numbers": [ 10, 12, 15 ], "interests": {{ "singing", "acting" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1080, "name": "Mohammad Ohr", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "hiking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1090, "name": "Jackson Fillerup", "lottery_numbers": [ 25, 30, 35 ], "interests": {{ "acting", "singing" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
-{ "user": { "uid": 30, "name": "Marvella Loud", "lottery_numbers": [ 40, 41, 42 ], "interests": {{  }} }, "visitor": { "vid": 1040, "name": "Luella Schweinert", "lottery_numbers": [ 41, 42, 43 ], "interests": {{ "hiking", "kayaking" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1080, "name": "Mohammad Ohr", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "hiking" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1090, "name": "Jackson Fillerup", "lottery_numbers": [ 25, 30, 35 ], "interests": {{ "acting", "singing" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1050, "name": "Harold Pendelton", "lottery_numbers": [ 10, 12, 15 ], "interests": {{ "singing", "acting" }} } }
-{ "user": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 90, "name": "Myrtice Cubias", "lottery_numbers": [ 20, 25, 43 ], "interests": {{ "kayaking", "running" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 90, "name": "Myrtice Cubias", "lottery_numbers": [ 20, 25, 43 ], "interests": {{ "kayaking", "running" }} }, "visitor": { "vid": 1080, "name": "Mohammad Ohr", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "hiking" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_3.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_3.adm
deleted file mode 100644
index 2b94840..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_3.adm
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 10, "name": "Jodi Rotruck", "lottery_numbers": [ 10, 15, 20 ], "interests": {{ "hiking", "running", "swimming" }} }, "visitor": { "vid": 1050, "name": "Harold Pendelton", "lottery_numbers": [ 10, 12, 15 ], "interests": {{ "singing", "acting" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1080, "name": "Mohammad Ohr", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "hiking" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1090, "name": "Jackson Fillerup", "lottery_numbers": [ 25, 30, 35 ], "interests": {{ "acting", "singing" }} } }
-{ "user": { "uid": 20, "name": "Clint Coil", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "biking", "painting" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
-{ "user": { "uid": 30, "name": "Marvella Loud", "lottery_numbers": [ 40, 41, 42 ], "interests": {{  }} }, "visitor": { "vid": 1040, "name": "Luella Schweinert", "lottery_numbers": [ 41, 42, 43 ], "interests": {{ "hiking", "kayaking" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1080, "name": "Mohammad Ohr", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "hiking" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1090, "name": "Jackson Fillerup", "lottery_numbers": [ 25, 30, 35 ], "interests": {{ "acting", "singing" }} } }
-{ "user": { "uid": 60, "name": "Larry Gothier", "lottery_numbers": [ 25, 30, 31 ], "interests": {{ "acting", "running" }} }, "visitor": { "vid": 1100, "name": "Laree Savasta", "lottery_numbers": [ 20, 30, 31 ], "interests": {{ "swimming", "hiking", "running" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1010, "name": "Alex Ascher", "lottery_numbers": [ 10, 15, 30 ], "interests": {{ "acting", "running" }} } }
-{ "user": { "uid": 70, "name": "Obdulia Dicosmo", "lottery_numbers": [ 10, 15, 40 ], "interests": {{ "running", "hiking", "biking" }} }, "visitor": { "vid": 1050, "name": "Harold Pendelton", "lottery_numbers": [ 10, 12, 15 ], "interests": {{ "singing", "acting" }} } }
-{ "user": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} }, "visitor": { "vid": 1030, "name": "Shanna Cuaresma", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "hiking", "running", "swimming", "biking" }} } }
-{ "user": { "uid": 80, "name": "Elias Leonardo", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "biking", "singing" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
-{ "user": { "uid": 90, "name": "Myrtice Cubias", "lottery_numbers": [ 20, 25, 43 ], "interests": {{ "kayaking", "running" }} }, "visitor": { "vid": 1020, "name": "Hank Friley", "lottery_numbers": [ 20, 25 ], "interests": {{ "running", "swimming", "biking" }} } }
-{ "user": { "uid": 90, "name": "Myrtice Cubias", "lottery_numbers": [ 20, 25, 43 ], "interests": {{ "kayaking", "running" }} }, "visitor": { "vid": 1080, "name": "Mohammad Ohr", "lottery_numbers": [ 20, 25, 30 ], "interests": {{ "hiking" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_4.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_4.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_5.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_5.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_1.adm
rename to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_2.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_2.adm
deleted file mode 100644
index d2f4951..0000000
--- a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_2.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "user": { "uid": 40, "name": "Tamie Pollara", "lottery_numbers": [ 45, 46, 47 ], "interests": {{ "singing", "acting", "running" }} }, "visitor": { "vid": 1070, "name": "Crystal Isabella", "lottery_numbers": [ 41, 45, 46 ], "interests": {{ "acting", "running", "painting" }} } }
diff --git a/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_1.adm b/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_1.adm
copy to asterix-app/src/test/resources/runtimets/results/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_02.adm b/asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_02/hdfs_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_02.adm
rename to asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_02/hdfs_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_03.adm b/asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_03/hdfs_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_03.adm
rename to asterix-app/src/test/resources/runtimets/results/hdfs/hdfs_03/hdfs_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/hdfs/issue_245_hdfs.adm b/asterix-app/src/test/resources/runtimets/results/hdfs/issue_245_hdfs/issue_245_hdfs.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/hdfs/issue_245_hdfs.adm
rename to asterix-app/src/test/resources/runtimets/results/hdfs/issue_245_hdfs/issue_245_hdfs.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_5.adm b/asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_5.adm
rename to asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_6.adm b/asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_6.adm
rename to asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_7.adm b/asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_7.adm
rename to asterix-app/src/test/resources/runtimets/results/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-join/btree-primary-equi-join.adm b/asterix-app/src/test/resources/runtimets/results/index-join/btree-primary-equi-join/btree-primary-equi-join.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-join/btree-primary-equi-join.adm
rename to asterix-app/src/test/resources/runtimets/results/index-join/btree-primary-equi-join/btree-primary-equi-join.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-join/btree-secondary-equi-join.adm b/asterix-app/src/test/resources/runtimets/results/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-join/btree-secondary-equi-join.adm
rename to asterix-app/src/test/resources/runtimets/results/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-join/rtree-spatial-intersect-point.adm b/asterix-app/src/test/resources/runtimets/results/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-join/rtree-spatial-intersect-point.adm
rename to asterix-app/src/test/resources/runtimets/results/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-composite-key.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-composite-key/btree-index-composite-key.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-composite-key.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-composite-key/btree-index-composite-key.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-rewrite-multiple.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-rewrite-multiple.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/cust-index-age-nullable.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/cust-index-age-nullable.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-contains.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-contains.adm
copy to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance-panic.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance-panic.adm
copy to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance.adm
deleted file mode 100644
index a218d95..0000000
--- a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 22, "dblpid": "books/acm/kim95/Motro95", "title": "Management of Uncerainty in database Systems.", "authors": "Amihai Motro", "misc": "2002-01-03 457-476 1995 Modern Database Systems db/books/collections/kim95.html#Motro95" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance-panic.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance-panic.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-jaccar/inverted-index-ngram-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-jaccar/inverted-index-ngram-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance-panic.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance-panic.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-jaccar/inverted-index-olist-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-olist-jaccar/inverted-index-olist-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ulist-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ulist-jaccar/inverted-index-ulist-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ulist-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ulist-jaccar/inverted-index-ulist-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-contains.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-contains.adm
deleted file mode 100644
index 8a99b26..0000000
--- a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-contains.adm
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "id": 4, "dblpid": "books/acm/kim95/ChristodoulakisK95", "title": "Multimedia Information Systems  Issues and Approaches.", "authors": "Stavros Christodoulakis Leonidas Koveos", "misc": "2002-01-03 318-337 1995 Modern Database Systems db/books/collections/kim95.html#ChristodoulakisK95" }
-{ "id": 89, "dblpid": "conf/icip/SchonfeldL98", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-11-05 123-127 1998 ICIP (3) db/conf/icip/icip1998-3.html#SchonfeldL98" }
-{ "id": 90, "dblpid": "conf/hicss/SchonfeldL99", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases ¾ Visual Search Engine.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-01-03 1999 HICSS http //computer.org/proceedings/hicss/0001/00013/00013006abs.htm db/conf/hicss/hicss1999-3.html#SchonfeldL99" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-contains.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-contains.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-jaccar/inverted-index-word-jaccar.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-ngram-jaccard.adm
copy to asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-jaccar/inverted-index-word-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-jaccard.adm
deleted file mode 100644
index 5bf6ae0..0000000
--- a/asterix-app/src/test/resources/runtimets/results/index-selection/inverted-index-word-jaccard.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 9, "dblpid": "books/acm/kim95/Kaiser95", "title": "Cooperative Transactions for Multiuser Environments.", "authors": "Gail E. Kaiser", "misc": "2002-01-03 409-433 1995 Modern Database Systems db/books/collections/kim95.html#Kaiser95" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive-open.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive-open.adm
copy to asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive.adm
deleted file mode 100644
index a00d8c2..0000000
--- a/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive.adm
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "o_orderkey": 7, "o_custkey": 40 }
-{ "o_orderkey": 3008, "o_custkey": 40 }
-{ "o_orderkey": 4934, "o_custkey": 40 }
-{ "o_orderkey": 4935, "o_custkey": 40 }
-{ "o_orderkey": 4995, "o_custkey": 40 }
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive-open.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive-open.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-open.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-open.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey/orders-index-custkey.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/orders-index-custkey/orders-index-custkey.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/range-search-open.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/range-search-open/range-search-open.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/range-search-open.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/range-search-open/range-search-open.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/range-search.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/range-search/range-search.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/range-search.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/range-search/range-search.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-nullable.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-nullable.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-open.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-open.adm
copy to asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index.adm
deleted file mode 100644
index 2ffad7c..0000000
--- a/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 12 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-open.adm b/asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index/rtree-secondary-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index-open.adm
rename to asterix-app/src/test/resources/runtimets/results/index-selection/rtree-secondary-index/rtree-secondary-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccar/ngram-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccar/ngram-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccar/olist-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccar/olist-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccar/ulist-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccar/ulist-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccar/word-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccar/word-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccar/ngram-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccar/ngram-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance/olist-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-edit-distance/olist-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccar/olist-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccar/olist-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccar/ulist-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccar/ulist-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccar/word-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccar/word-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccard-inline.adm b/asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccard-inline.adm
rename to asterix-app/src/test/resources/runtimets/results/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/get-item_01.adm b/asterix-app/src/test/resources/runtimets/results/list/get-item_01/get-item_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/get-item_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/get-item_01/get-item_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/len_01.adm b/asterix-app/src/test/resources/runtimets/results/list/len_01/len_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/len_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/len_01/len_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/len_null_01.adm b/asterix-app/src/test/resources/runtimets/results/list/len_null_01/len_null_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/len_null_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/len_null_01/len_null_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/listify_01.adm b/asterix-app/src/test/resources/runtimets/results/list/listify_01/listify_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/listify_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/listify_01/listify_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/listify_02.adm b/asterix-app/src/test/resources/runtimets/results/list/listify_02/listify_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/listify_02.adm
rename to asterix-app/src/test/resources/runtimets/results/list/listify_02/listify_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/listify_03.adm b/asterix-app/src/test/resources/runtimets/results/list/listify_03/listify_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/listify_03.adm
rename to asterix-app/src/test/resources/runtimets/results/list/listify_03/listify_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/any-collection-member_01.adm b/asterix-app/src/test/resources/runtimets/results/list/ny-collection-member_01/ny-collection-member_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/any-collection-member_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/ny-collection-member_01/ny-collection-member_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_01.adm b/asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_01/ordered-list-constructor_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_01/ordered-list-constructor_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_02.adm b/asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_02/ordered-list-constructor_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_02.adm
rename to asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_02/ordered-list-constructor_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_03.adm b/asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_03/ordered-list-constructor_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_03.adm
rename to asterix-app/src/test/resources/runtimets/results/list/ordered-list-constructor_03/ordered-list-constructor_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/scan-collection_01.adm b/asterix-app/src/test/resources/runtimets/results/list/scan-collection_01/scan-collection_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/scan-collection_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/scan-collection_01/scan-collection_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/union_01.adm b/asterix-app/src/test/resources/runtimets/results/list/union_01/union_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/union_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/union_01/union_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/union_02.adm b/asterix-app/src/test/resources/runtimets/results/list/union_02/union_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/union_02.adm
rename to asterix-app/src/test/resources/runtimets/results/list/union_02/union_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_01.adm b/asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_01/unordered-list-constructor_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_01.adm
rename to asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_01/unordered-list-constructor_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_02.adm b/asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_02/unordered-list-constructor_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_02.adm
rename to asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_02/unordered-list-constructor_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_03.adm b/asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_03/unordered-list-constructor_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_03.adm
rename to asterix-app/src/test/resources/runtimets/results/list/unordered-list-constructor_03/unordered-list-constructor_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/float_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/float_01/float_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/float_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/float_01/float_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/groupby-orderby-count.adm b/asterix-app/src/test/resources/runtimets/results/misc/groupby-orderby-count/groupby-orderby-count.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/groupby-orderby-count.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/groupby-orderby-count/groupby-orderby-count.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/ifthenelse_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/ifthenelse_01/ifthenelse_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/ifthenelse_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/ifthenelse_01/ifthenelse_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/is-null_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/is-null_01/is-null_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/is-null_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/is-null_01/is-null_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/nested-loop-join_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/nested-loop-join_01/nested-loop-join_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/nested-loop-join_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/nested-loop-join_01/nested-loop-join_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/range_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/range_01/range_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/range_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/range_01/range_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/tid_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/tid_01/tid_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/tid_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/tid_01/tid_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/misc/year_01.adm b/asterix-app/src/test/resources/runtimets/results/misc/year_01/year_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/misc/year_01.adm
rename to asterix-app/src/test/resources/runtimets/results/misc/year_01/year_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/nestrecords/nestrecord.adm b/asterix-app/src/test/resources/runtimets/results/nestrecords/nestrecor/nestrecor.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/nestrecords/nestrecord.adm
rename to asterix-app/src/test/resources/runtimets/results/nestrecords/nestrecor/nestrecor.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/add_double.adm b/asterix-app/src/test/resources/runtimets/results/numeric/_double/_double.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/add_double.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/_double/_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/add_float.adm b/asterix-app/src/test/resources/runtimets/results/numeric/_float/_float.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/add_float.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/_float/_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/add_int16.adm b/asterix-app/src/test/resources/runtimets/results/numeric/_int16/_int16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/add_int16.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/_int16/_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/add_int32.adm b/asterix-app/src/test/resources/runtimets/results/numeric/_int32/_int32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/add_int32.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/_int32/_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/add_int64.adm b/asterix-app/src/test/resources/runtimets/results/numeric/_int64/_int64.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/add_int64.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/_int64/_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/add_int8.adm b/asterix-app/src/test/resources/runtimets/results/numeric/_int8/_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/add_int8.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/_int8/_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/bs0/bs0.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/bs0/bs0.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/bs1/bs1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/abs1.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/bs1/bs1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs2.adm b/asterix-app/src/test/resources/runtimets/results/numeric/bs2/bs2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/abs2.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/bs2/bs2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs3.adm b/asterix-app/src/test/resources/runtimets/results/numeric/bs3/bs3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/abs3.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/bs3/bs3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs4.adm b/asterix-app/src/test/resources/runtimets/results/numeric/bs4/bs4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/abs4.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/bs4/bs4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ceiling0.adm
deleted file mode 100644
index 61c5048..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling0.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": 0i8, "f1": 0i16, "f2": 0, "f3": 0i64, "f4": 0i8, "f5": 0i16, "f6": 0, "f7": 0i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ceiling0/ceiling0.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/ceiling0/ceiling0.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ceiling1/ceiling1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/ceiling1/ceiling1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling2.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ceiling2/ceiling2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/ceiling2.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ceiling2/ceiling2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling3.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ceiling3/ceiling3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/ceiling3.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ceiling3/ceiling3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling4.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ceiling4/ceiling4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/ceiling4.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ceiling4/ceiling4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/floor0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor0.adm
deleted file mode 100644
index 61c5048..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/floor0.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": 0i8, "f1": 0i16, "f2": 0, "f3": 0i64, "f4": 0i8, "f5": 0i16, "f6": 0, "f7": 0i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor0/floor0.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/floor0/floor0.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/floor1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor1.adm
deleted file mode 100644
index bf278a1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/floor1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": -20i8, "f1": -23i16, "f2": -29, "f3": -21i64, "f4": 20i8, "f5": 22i16, "f6": 23, "f7": 27i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor1/floor1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/floor1/floor1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/floor2.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor2/floor2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/floor2.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/floor2/floor2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/floor3.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor3/floor3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/floor3.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/floor3/floor3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/floor4.adm b/asterix-app/src/test/resources/runtimets/results/numeric/floor4/floor4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/floor4.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/floor4/floor4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/divide_double.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ivide_double/ivide_double.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/divide_double.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ivide_double/ivide_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/divide_float.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ivide_float/ivide_float.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/divide_float.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ivide_float/ivide_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/divide_int16.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ivide_int16/ivide_int16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/divide_int16.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ivide_int16/ivide_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/divide_int32.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ivide_int32/ivide_int32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/divide_int32.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ivide_int32/ivide_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/divide_int64.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ivide_int64/ivide_int64.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/divide_int64.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ivide_int64/ivide_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/divide_int8.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ivide_int8/ivide_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/divide_int8.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ivide_int8/ivide_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even0.adm
deleted file mode 100644
index 61c5048..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even0.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": 0i8, "f1": 0i16, "f2": 0, "f3": 0i64, "f4": 0i8, "f5": 0i16, "f6": 0, "f7": 0i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even0/round-half-to-even0.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even0/round-half-to-even0.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even1.adm
deleted file mode 100644
index bf278a1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": -20i8, "f1": -23i16, "f2": -29, "f3": -21i64, "f4": 20i8, "f5": 22i16, "f6": 23, "f7": 27i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even1/round-half-to-even1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even1/round-half-to-even1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even2.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even2/round-half-to-even2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even2.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even2/round-half-to-even2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even20.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even20.adm
deleted file mode 100644
index 61c5048..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even20.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": 0i8, "f1": 0i16, "f2": 0, "f3": 0i64, "f4": 0i8, "f5": 0i16, "f6": 0, "f7": 0i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even20/round-half-to-even20.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even20/round-half-to-even20.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even21.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even21.adm
deleted file mode 100644
index bf278a1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even21.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": -20i8, "f1": -23i16, "f2": -29, "f3": -21i64, "f4": 20i8, "f5": 22i16, "f6": 23, "f7": 27i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even21/round-half-to-even21.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even21/round-half-to-even21.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even22.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even22/round-half-to-even22.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even22.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even22/round-half-to-even22.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even23.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even23/round-half-to-even23.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even23.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even23/round-half-to-even23.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even24.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even24/round-half-to-even24.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even24.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even24/round-half-to-even24.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even3.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even3/round-half-to-even3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even3.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even3/round-half-to-even3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even4.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even4/round-half-to-even4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even4.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even4/round-half-to-even4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even5.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even5/round-half-to-even5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even5.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round-half-to-even5/round-half-to-even5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round0.adm
deleted file mode 100644
index 61c5048..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/round0.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": 0i8, "f1": 0i16, "f2": 0, "f3": 0i64, "f4": 0i8, "f5": 0i16, "f6": 0, "f7": 0i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round0/round0.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/abs0.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/round0/round0.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round1.adm
deleted file mode 100644
index bf278a1..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/round1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f0": -20i8, "f1": -23i16, "f2": -29, "f3": -21i64, "f4": 20i8, "f5": 22i16, "f6": 23, "f7": 27i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round1/round1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/ceiling1.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/round1/round1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round2.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round2/round2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round2.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round2/round2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round3.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round3/round3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round3.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round3/round3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/round4.adm b/asterix-app/src/test/resources/runtimets/results/numeric/round4/round4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/round4.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/round4/round4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/subtract_double.adm b/asterix-app/src/test/resources/runtimets/results/numeric/subtract_double/subtract_double.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/subtract_double.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/subtract_double/subtract_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/subtract_float.adm b/asterix-app/src/test/resources/runtimets/results/numeric/subtract_float/subtract_float.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/subtract_float.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/subtract_float/subtract_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int16.adm b/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int16/subtract_int16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/subtract_int16.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/subtract_int16/subtract_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int32.adm b/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int32/subtract_int32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/subtract_int32.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/subtract_int32/subtract_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int64.adm b/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int64/subtract_int64.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/subtract_int64.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/subtract_int64/subtract_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int8.adm b/asterix-app/src/test/resources/runtimets/results/numeric/subtract_int8/subtract_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/subtract_int8.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/subtract_int8/subtract_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/multiply_double.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ultiply_double/ultiply_double.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/multiply_double.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ultiply_double/ultiply_double.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/multiply_float.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ultiply_float/ultiply_float.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/multiply_float.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ultiply_float/ultiply_float.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/multiply_int16.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int16/ultiply_int16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/multiply_int16.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int16/ultiply_int16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/multiply_int32.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int32/ultiply_int32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/multiply_int32.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int32/ultiply_int32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/multiply_int64.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int64/ultiply_int64.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/multiply_int64.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int64/ultiply_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/multiply_int8.adm b/asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int8/ultiply_int8.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/multiply_int8.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/ultiply_int8/ultiply_int8.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_01.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_01/unary-minus_double_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_01.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_01/unary-minus_double_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_02.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_02.adm
deleted file mode 100644
index 3a72bb8..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "double1": 2.056E-29d, "double2": NaNd, "double3": -Infinityd, "double4": Infinityd }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_01.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_02/unary-minus_double_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_01.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_double_02/unary-minus_double_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_01.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_01/unary-minus_float_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_01.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_01/unary-minus_float_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_02.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_02.adm
deleted file mode 100644
index e6541ae..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "float1": 80.2f, "float2": NaNf, "float3": -Infinityf, "float4": Infinityf }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_01.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_02/unary-minus_float_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_01.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_float_02/unary-minus_float_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_01.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_01/unary-minus_int_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_01.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_01/unary-minus_int_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_02.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_02.adm
deleted file mode 100644
index 4ecc59b..0000000
--- a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "int8": -80i8, "int16": -160i16, "int32": -320, "int64": 640i64 }
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_01.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_02/unary-minus_int_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_01.adm
copy to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_int_02/unary-minus_int_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_null.adm b/asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_null/unary-minus_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_null.adm
rename to asterix-app/src/test/resources/runtimets/results/numeric/unary-minus_null/unary-minus_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list-ordered01.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list-ordered01.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list01.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list01/heterog-list01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list01.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/heterog-list01/heterog-list01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-01.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-01/open-closed-01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-01.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-01/open-closed-01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-12.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-12/open-closed-12.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-12.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-12/open-closed-12.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-14.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-14/open-closed-14.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-14.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-14/open-closed-14.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-24.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-24/open-closed-24.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-24.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-24/open-closed-24.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-25.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-25.adm
deleted file mode 100644
index fbcf8ee..0000000
--- a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-25.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 32, "name": "UCI", "opt_tag": {{ "optional text", "put any text here", "and more" }} }
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-24.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-25/open-closed-25.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-24.adm
copy to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-25/open-closed-25.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-26.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-26/open-closed-26.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-26.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-26/open-closed-26.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-29.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-29/open-closed-29.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-29.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-29/open-closed-29.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-31.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-31/open-closed-31.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-31.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-31/open-closed-31.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-32.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-32/open-closed-32.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-32.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-32/open-closed-32.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-33.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-33.adm
deleted file mode 100644
index 2103e83..0000000
--- a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-33.adm
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ "hiking", "scuba", "painting", "biking" }}
-{{ "tennis", "scuba", "running", "biking" }}
-{{ "gardening", "biking", "reading", "hiking", "fishing" }}
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-32.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-33/open-closed-33.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-32.adm
copy to asterix-app/src/test/resources/runtimets/results/open-closed/open-closed-33/open-closed-33.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue134.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue134/query-issue134.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue134.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue134/query-issue134.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue166.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue166/query-issue166.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue166.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue166/query-issue166.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue208.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue208/query-issue208.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue208.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue208/query-issue208.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue236.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue236/query-issue236.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue236.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue236/query-issue236.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue29.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue29/query-issue29.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue29.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue29/query-issue29.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55-1.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55-1/query-issue55-1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55-1.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55-1/query-issue55-1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55/query-issue55.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-issue55/query-issue55.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal/query-proposal.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal.adm
rename to asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal/query-proposal.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal02.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal02.adm
deleted file mode 100644
index 23ab1f6..0000000
--- a/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal02.adm
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "topic": "at&t", "count": 1 }
-{ "topic": "att", "count": 1 }
-{ "topic": "commercials", "count": 1 }
-{ "topic": "iphone", "count": 1 }
-{ "topic": "verizon", "count": 3 }
diff --git a/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal.adm b/asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal02/query-proposal02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal.adm
copy to asterix-app/src/test/resources/runtimets/results/open-closed/query-proposal02/query-proposal02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_01.adm b/asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_01/everysat_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_01.adm
rename to asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_01/everysat_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_02.adm b/asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_02/everysat_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_02.adm
rename to asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_02/everysat_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_04.adm b/asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_04/everysat_04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_04.adm
rename to asterix-app/src/test/resources/runtimets/results/quantifiers/everysat_04/everysat_04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_01.adm b/asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_01/somesat_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_01.adm
rename to asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_01/somesat_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_02.adm b/asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_02/somesat_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_02.adm
rename to asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_02/somesat_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_06.adm b/asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_06/somesat_06.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_06.adm
rename to asterix-app/src/test/resources/runtimets/results/quantifiers/somesat_06/somesat_06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01.adm b/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01/closed-record-constructor_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01.adm
copy to asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01/closed-record-constructor_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02.adm b/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02/closed-record-constructor_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02.adm
copy to asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02/closed-record-constructor_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_03.adm b/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_03/closed-record-constructor_03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_03.adm
rename to asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_03/closed-record-constructor_03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/expFieldName.adm b/asterix-app/src/test/resources/runtimets/results/records/expFieldName/expFieldName.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/records/expFieldName.adm
rename to asterix-app/src/test/resources/runtimets/results/records/expFieldName/expFieldName.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/field-access-by-index_01.adm b/asterix-app/src/test/resources/runtimets/results/records/field-access-by-index_01/field-access-by-index_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/records/field-access-by-index_01.adm
rename to asterix-app/src/test/resources/runtimets/results/records/field-access-by-index_01/field-access-by-index_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/field-access-on-open-field.adm b/asterix-app/src/test/resources/runtimets/results/records/field-access-on-open-fiel/field-access-on-open-fiel.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/records/field-access-on-open-field.adm
rename to asterix-app/src/test/resources/runtimets/results/records/field-access-on-open-fiel/field-access-on-open-fiel.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01.adm b/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01.adm
deleted file mode 100644
index 76324d0..0000000
--- a/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "foo1": 10, "bar1": 20, "foo2": 30, "bar2": 40 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01.adm b/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01/open-record-constructor_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01.adm
rename to asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01/open-record-constructor_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02.adm b/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02.adm
deleted file mode 100644
index 05889d5..0000000
--- a/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "foo1": 10, "bar1": { "bar1.1": 10, "bar1.2": 20, "bar1.3": 30, "bar1.4": { "bar1.4.1": 10, "bar1.4.2": 20, "bar1.4.3": 30, "bar1.4.4": 40 }, "foo2": 30, "bar2": 40 }, "foo2": 30, "bar2": 40 }
diff --git a/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02.adm b/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02/open-record-constructor_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02.adm
rename to asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02/open-record-constructor_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/10.adm b/asterix-app/src/test/resources/runtimets/results/scan/10/10.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/10.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/10/10.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/20.adm b/asterix-app/src/test/resources/runtimets/results/scan/20/20.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/20.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/20/20.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/30.adm b/asterix-app/src/test/resources/runtimets/results/scan/30/30.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/30.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/30/30.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_1.adm b/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_1/issue238_query_1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/issue238_query_1.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/issue238_query_1/issue238_query_1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_2.adm b/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_2.adm
deleted file mode 100644
index a7ec8f6..0000000
--- a/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_2.adm
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "id": 1, "dblpid": "books/acm/kim95/AnnevelinkACFHK95", "title": "Object SQL - A Language for the Design and Implementation of Object Databases.", "authors": "Jurgen Annevelink Rafiul Ahad Amelia Carlson Daniel H. Fishman Michael L. Heytens William Kent", "misc": "2002-01-03 42-68 1995 Modern Database Systems db/books/collections/kim95.html#AnnevelinkACFHK95" }
-{ "id": 2, "dblpid": "books/acm/kim95/Blakeley95", "title": "OQL[C++]  Extending C++ with an Object Query Capability.", "authors": "José A. Blakeley", "misc": "2002-01-03 69-88 Modern Database Systems db/books/collections/kim95.html#Blakeley95 1995" }
-{ "id": 3, "dblpid": "books/acm/kim95/BreitbartGS95", "title": "Transaction Management in Multidatabase Systems.", "authors": "Yuri Breitbart Hector Garcia-Molina Abraham Silberschatz", "misc": "2004-03-08 573-591 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#BreitbartGS95 1995" }
-{ "id": 4, "dblpid": "books/acm/kim95/ChristodoulakisK95", "title": "Multimedia Information Systems  Issues and Approaches.", "authors": "Stavros Christodoulakis Leonidas Koveos", "misc": "2002-01-03 318-337 1995 Modern Database Systems db/books/collections/kim95.html#ChristodoulakisK95" }
-{ "id": 5, "dblpid": "books/acm/kim95/DayalHW95", "title": "Active Database Systems.", "authors": "Umeshwar Dayal Eric N. Hanson Jennifer Widom", "misc": "2002-01-03 434-456 1995 Modern Database Systems db/books/collections/kim95.html#DayalHW95" }
-{ "id": 6, "dblpid": "books/acm/kim95/DittrichD95", "title": "Where Object-Oriented DBMSs Should Do Better  A Critique Based on Early Experiences.", "authors": "Angelika Kotz Dittrich Klaus R. Dittrich", "misc": "2002-01-03 238-254 1995 Modern Database Systems db/books/collections/kim95.html#DittrichD95" }
-{ "id": 7, "dblpid": "books/acm/kim95/Garcia-MolinaH95", "title": "Distributed Databases.", "authors": "Hector Garcia-Molina Meichun Hsu", "misc": "2002-01-03 477-493 1995 Modern Database Systems db/books/collections/kim95.html#Garcia-MolinaH95" }
-{ "id": 8, "dblpid": "books/acm/kim95/Goodman95", "title": "An Object-Oriented DBMS War Story  Developing a Genome Mapping Database in C++.", "authors": "Nathan Goodman", "misc": "2002-01-03 216-237 1995 Modern Database Systems db/books/collections/kim95.html#Goodman95" }
-{ "id": 9, "dblpid": "books/acm/kim95/Kaiser95", "title": "Cooperative Transactions for Multiuser Environments.", "authors": "Gail E. Kaiser", "misc": "2002-01-03 409-433 1995 Modern Database Systems db/books/collections/kim95.html#Kaiser95" }
-{ "id": 10, "dblpid": "books/acm/kim95/KelleyGKRG95", "title": "Schema Architecture of the UniSQL/M Multidatabase System", "authors": "William Kelley Sunit K. Gala Won Kim Tom C. Reyes Bruce Graham", "misc": "2004-03-08 Modern Database Systems books/acm/Kim95 621-648 1995 db/books/collections/kim95.html#KelleyGKRG95" }
-{ "id": 11, "dblpid": "books/acm/kim95/KemperM95", "title": "Physical Object Management.", "authors": "Alfons Kemper Guido Moerkotte", "misc": "2002-01-03 175-202 1995 Modern Database Systems db/books/collections/kim95.html#KemperM95" }
-{ "id": 12, "dblpid": "books/acm/kim95/Kim95", "title": "Introduction to Part 1  Next-Generation Database Technology.", "authors": "Won Kim", "misc": "2002-01-03 5-17 1995 Modern Database Systems db/books/collections/kim95.html#Kim95" }
-{ "id": 13, "dblpid": "books/acm/kim95/Kim95a", "title": "Object-Oriented Database Systems  Promises, Reality, and Future.", "authors": "Won Kim", "misc": "2002-01-03 255-280 1995 Modern Database Systems db/books/collections/kim95.html#Kim95a" }
-{ "id": 14, "dblpid": "books/acm/kim95/Kim95b", "title": "Introduction to Part 2  Technology for Interoperating Legacy Databases.", "authors": "Won Kim", "misc": "2002-01-03 515-520 1995 Modern Database Systems db/books/collections/kim95.html#Kim95b" }
-{ "id": 15, "dblpid": "books/acm/kim95/KimCGS95", "title": "On Resolving Schematic Heterogeneity in Multidatabase Systems.", "authors": "Won Kim Injun Choi Sunit K. Gala Mark Scheevel", "misc": "2002-01-03 521-550 1995 Modern Database Systems db/books/collections/kim95.html#KimCGS95" }
-{ "id": 16, "dblpid": "books/acm/kim95/KimG95", "title": "Requirements for a Performance Benchmark for Object-Oriented Database Systems.", "authors": "Won Kim Jorge F. Garza", "misc": "2002-01-03 203-215 1995 Modern Database Systems db/books/collections/kim95.html#KimG95" }
-{ "id": 17, "dblpid": "books/acm/kim95/KimK95", "title": "On View Support in Object-Oriented Databases Systems.", "authors": "Won Kim William Kelley", "misc": "2002-01-03 108-129 1995 Modern Database Systems db/books/collections/kim95.html#KimK95" }
-{ "id": 18, "dblpid": "books/acm/kim95/Kowalski95", "title": "The POSC Solution to Managing E&P Data.", "authors": "Vincent J. Kowalski", "misc": "2002-01-03 281-301 1995 Modern Database Systems db/books/collections/kim95.html#Kowalski95" }
-{ "id": 19, "dblpid": "books/acm/kim95/KriegerA95", "title": "C++ Bindings to an Object Database.", "authors": "David Krieger Tim Andrews", "misc": "2002-01-03 89-107 1995 Modern Database Systems db/books/collections/kim95.html#KriegerA95" }
-{ "id": 20, "dblpid": "books/acm/kim95/Lunt95", "title": "Authorization in Object-Oriented Databases.", "authors": "Teresa F. Lunt", "misc": "2002-01-03 130-145 1995 Modern Database Systems db/books/collections/kim95.html#Lunt95" }
-{ "id": 21, "dblpid": "books/acm/kim95/MengY95", "title": "Query Processing in Multidatabase Systems.", "authors": "Weiyi Meng Clement T. Yu", "misc": "2002-01-03 551-572 1995 Modern Database Systems db/books/collections/kim95.html#MengY95" }
-{ "id": 22, "dblpid": "books/acm/kim95/Motro95", "title": "Management of Uncerainty in database Systems.", "authors": "Amihai Motro", "misc": "2002-01-03 457-476 1995 Modern Database Systems db/books/collections/kim95.html#Motro95" }
-{ "id": 23, "dblpid": "books/acm/kim95/Omiecinski95", "title": "Parallel Relational Database Systems.", "authors": "Edward Omiecinski", "misc": "2002-01-03 494-512 1995 Modern Database Systems db/books/collections/kim95.html#Omiecinski95" }
-{ "id": 24, "dblpid": "books/acm/kim95/OzsuB95", "title": "Query Processing in Object-Oriented Database Systems.", "authors": "M. Tamer Özsu José A. Blakeley", "misc": "2002-01-03 146-174 1995 Modern Database Systems db/books/collections/kim95.html#OzsuB95" }
-{ "id": 25, "dblpid": "books/acm/kim95/RusinkiewiczS95", "title": "Specification and Execution of Transactional Workflows.", "authors": "Marek Rusinkiewicz Amit P. Sheth", "misc": "2004-03-08 592-620 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#RusinkiewiczS95 1995" }
-{ "id": 26, "dblpid": "books/acm/kim95/Samet95", "title": "Spatial Data Structures.", "authors": "Hanan Samet", "misc": "2004-03-08 361-385 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#Samet95 1995" }
-{ "id": 27, "dblpid": "books/acm/kim95/SametA95", "title": "Spatial Data Models and Query Processing.", "authors": "Hanan Samet Walid G. Aref", "misc": "2002-01-03 338-360 1995 Modern Database Systems db/books/collections/kim95.html#SametA95" }
-{ "id": 28, "dblpid": "books/acm/kim95/ShanADDK95", "title": "Pegasus  A Heterogeneous Information Management System.", "authors": "Ming-Chien Shan Rafi Ahmed Jim Davis Weimin Du William Kent", "misc": "2004-03-08 664-682 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#ShanADDK95 1995" }
-{ "id": 29, "dblpid": "books/acm/kim95/Snodgrass95", "title": "Temporal Object-Oriented Databases  A Critical Comparison.", "authors": "Richard T. Snodgrass", "misc": "2002-01-03 386-408 1995 Modern Database Systems db/books/collections/kim95.html#Snodgrass95" }
-{ "id": 30, "dblpid": "books/acm/kim95/SoleyK95", "title": "The OMG Object Model.", "authors": "Richard Mark Soley William Kent", "misc": "2002-01-03 18-41 1995 Modern Database Systems db/books/collections/kim95.html#SoleyK95" }
-{ "id": 31, "dblpid": "books/acm/kim95/Stout95", "title": "EDA/SQL.", "authors": "Ralph L. Stout", "misc": "2004-03-08 649-663 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#Stout95 1995" }
-{ "id": 32, "dblpid": "books/acm/kim95/Thompson95", "title": "The Changing Database Standards Landscape.", "authors": "Craig W. Thompson", "misc": "2002-01-03 302-317 1995 Modern Database Systems db/books/collections/kim95.html#Thompson95" }
-{ "id": 33, "dblpid": "books/acm/kim95/BreitbartR95", "title": "Overview of the ADDS System.", "authors": "Yuri Breitbart Tom C. Reyes", "misc": "2009-06-12 683-701 Modern Database Systems books/acm/Kim95 db/books/collections/kim95.html#BreitbartR95 1995" }
-{ "id": 34, "dblpid": "books/acm/Kim95", "title": "Modern Database Systems  The Object Model, Interoperability, and Beyond.", "authors": "", "misc": "2004-03-08 Won Kim Modern Database Systems ACM Press and Addison-Wesley 1995 0-201-59098-0 db/books/collections/kim95.html" }
-{ "id": 35, "dblpid": "books/ap/MarshallO79", "title": "Inequalities  Theory of Majorization and Its Application.", "authors": "Albert W. Marshall Ingram Olkin", "misc": "2002-01-03 Academic Press 1979 0-12-473750-1" }
-{ "id": 36, "dblpid": "books/aw/kimL89/BjornerstedtH89", "title": "Version Control in an Object-Oriented Architecture.", "authors": "Anders Björnerstedt Christer Hulten", "misc": "2006-02-24 451-485 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#BjornerstedtH89" }
-{ "id": 37, "dblpid": "books/aw/kimL89/BretlMOPSSWW89", "title": "The GemStone Data Management System.", "authors": "Robert Bretl David Maier Allen Otis D. Jason Penney Bruce Schuchardt Jacob Stein E. Harold Williams Monty Williams", "misc": "2002-01-03 283-308 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#BretlMOPSSWW89" }
-{ "id": 38, "dblpid": "books/aw/kimL89/CareyDRS89", "title": "Storage Management in EXODUS.", "authors": "Michael J. Carey David J. DeWitt Joel E. Richardson Eugene J. Shekita", "misc": "2002-01-03 341-369 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#CareyDRS89" }
-{ "id": 39, "dblpid": "books/aw/kimL89/Decouchant89", "title": "A Distributed Object Manager for the Smalltalk-80 System.", "authors": "Dominique Decouchant", "misc": "2002-01-03 487-520 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#Decouchant89" }
-{ "id": 40, "dblpid": "books/aw/kimL89/DiederichM89", "title": "Objects, Messages, and Rules in Database Design.", "authors": "Jim Diederich Jack Milton", "misc": "2002-01-03 177-197 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#DiederichM89" }
-{ "id": 41, "dblpid": "books/aw/kimL89/EllisG89", "title": "Active Objects  Ealities and Possibilities.", "authors": "Clarence A. Ellis Simon J. Gibbs", "misc": "2002-01-03 561-572 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#EllisG89" }
-{ "id": 42, "dblpid": "books/aw/kimL89/FishmanABCCDHHKLLMNRSW89", "title": "Overview of the Iris DBMS.", "authors": "Daniel H. Fishman Jurgen Annevelink David Beech E. C. Chow Tim Connors J. W. Davis Waqar Hasan C. G. Hoch William Kent S. Leichner Peter Lyngbæk Brom Mahbod Marie-Anne Neimat Tore Risch Ming-Chien Shan W. Kevin Wilkinson", "misc": "2002-01-03 219-250 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#FishmanABCCDHHKLLMNRSW89" }
-{ "id": 43, "dblpid": "books/aw/kimL89/KimBCGW89", "title": "Features of the ORION Object-Oriented Database System.", "authors": "Won Kim Nat Ballou Hong-Tai Chou Jorge F. Garza Darrell Woelk", "misc": "2002-01-03 251-282 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#KimBCGW89" }
-{ "id": 44, "dblpid": "books/aw/kimL89/KimKD89", "title": "Indexing Techniques for Object-Oriented Databases.", "authors": "Won Kim Kyung-Chang Kim Alfred G. Dale", "misc": "2002-01-03 371-394 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#KimKD89" }
-{ "id": 45, "dblpid": "books/aw/kimL89/King89", "title": "My Cat Is Object-Oriented.", "authors": "Roger King", "misc": "2002-01-03 23-30 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#King89" }
-{ "id": 46, "dblpid": "books/aw/kimL89/Maier89", "title": "Making Database Systems Fast Enough for CAD Applications.", "authors": "David Maier", "misc": "2002-01-03 573-582 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#Maier89" }
-{ "id": 47, "dblpid": "books/aw/kimL89/MellenderRS89", "title": "Optimizing Smalltalk Message Performance.", "authors": "Fred Mellender Steve Riegel Andrew Straw", "misc": "2002-01-03 423-450 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#MellenderRS89" }
-{ "id": 48, "dblpid": "books/aw/kimL89/Moon89", "title": "The Common List Object-Oriented Programming Language Standard.", "authors": "David A. Moon", "misc": "2002-01-03 49-78 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#Moon89" }
-{ "id": 49, "dblpid": "books/aw/kimL89/Moss89", "title": "Object Orientation as Catalyst for Language-Database Inegration.", "authors": "J. Eliot B. Moss", "misc": "2002-01-03 583-592 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#Moss89" }
-{ "id": 50, "dblpid": "books/aw/kimL89/Nierstrasz89", "title": "A Survey of Object-Oriented Concepts.", "authors": "Oscar Nierstrasz", "misc": "2002-01-03 3-21 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#Nierstrasz89" }
-{ "id": 51, "dblpid": "books/aw/kimL89/NierstraszT89", "title": "Integrated Office Systems.", "authors": "Oscar Nierstrasz Dennis Tsichritzis", "misc": "2002-01-03 199-215 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#NierstraszT89" }
-{ "id": 52, "dblpid": "books/aw/kimL89/Russinoff89", "title": "Proteus  A Frame-Based Nonmonotonic Inference System.", "authors": "David M. Russinoff", "misc": "2002-01-03 127-150 Object-Oriented Concepts, Databases, and Applications ACM Press and Addison-Wesley 1989 db/books/collections/kim89.html#Russinoff89" }
-{ "id": 53, "dblpid": "books/aw/kimL89/SkarraZ89", "title": "Concurrency Control and Object-Oriented Databases.", "authors": "Andrea H. Skarra Stanley B. Zdonik", "misc": "2002-01-03 395-421 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SkarraZ89" }
-{ "id": 54, "dblpid": "books/aw/kimL89/SteinLU89", "title": "A Shared View of Sharing  The Treaty of Orlando.", "authors": "Lynn Andrea Stein Henry Lieberman David Ungar", "misc": "2002-01-03 31-48 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#SteinLU89" }
-{ "id": 55, "dblpid": "books/aw/kimL89/TarltonT89", "title": "Pogo  A Declarative Representation System for Graphics.", "authors": "Mark A. Tarlton P. Nong Tarlton", "misc": "2002-01-03 151-176 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#TarltonT89" }
-{ "id": 56, "dblpid": "books/aw/kimL89/TomlinsonS89", "title": "Concurrent Object-Oriented Programming Languages.", "authors": "Chris Tomlinson Mark Scheevel", "misc": "2002-01-03 79-124 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#TomlinsonS89" }
-{ "id": 57, "dblpid": "books/aw/kimL89/TsichritzisN89", "title": "Directions in Object-Oriented Research.", "authors": "Dennis Tsichritzis Oscar Nierstrasz", "misc": "2002-01-03 523-536 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#TsichritzisN89" }
-{ "id": 58, "dblpid": "books/aw/kimL89/Wand89", "title": "A Proposal for a Formal Model of Objects.", "authors": "Yair Wand", "misc": "2002-01-03 537-559 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#Wand89" }
-{ "id": 59, "dblpid": "books/aw/kimL89/WeiserL89", "title": "OZ+  An Object-Oriented Database System.", "authors": "Stephen P. Weiser Frederick H. Lochovsky", "misc": "2002-01-03 309-337 1989 Object-Oriented Concepts, Databases, and Applications db/books/collections/kim89.html#WeiserL89" }
-{ "id": 60, "dblpid": "books/aw/stonebraker86/RoweS86", "title": "The Commercial INGRES Epilogue.", "authors": "Lawrence A. Rowe Michael Stonebraker", "misc": "2002-01-03 63-82 1986 The INGRES Papers db/books/collections/Stonebraker86.html#RoweS86 db/books/collections/Stonebraker86/RoweS86.html ingres/P063.pdf" }
-{ "id": 61, "dblpid": "books/aw/stonebraker86/Stonebraker86", "title": "Design of Relational Systems (Introduction to Section 1).", "authors": "Michael Stonebraker", "misc": "2002-01-03 1-3 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86 db/books/collections/Stonebraker86/Stonebraker86.html ingres/P001.pdf" }
-{ "id": 62, "dblpid": "books/aw/stonebraker86/Stonebraker86a", "title": "Supporting Studies on Relational Systems (Introduction to Section 2).", "authors": "Michael Stonebraker", "misc": "2002-01-03 83-85 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86a db/books/collections/Stonebraker86/Stonebraker86a.html ingres/P083.pdf" }
-{ "id": 63, "dblpid": "books/aw/stonebraker86/Stonebraker86b", "title": "Distributed Database Systems (Introduction to Section 3).", "authors": "Michael Stonebraker", "misc": "2002-01-03 183-186 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86b db/books/collections/Stonebraker86/Stonebraker86b.html ingres/P183.pdf" }
-{ "id": 64, "dblpid": "books/aw/stonebraker86/Stonebraker86c", "title": "The Design and Implementation of Distributed INGRES.", "authors": "Michael Stonebraker", "misc": "2002-01-03 187-196 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86c db/books/collections/Stonebraker86/Stonebraker86c.html ingres/P187.pdf" }
-{ "id": 65, "dblpid": "books/aw/stonebraker86/Stonebraker86d", "title": "User Interfaces for Database Systems (Introduction to Section 4).", "authors": "Michael Stonebraker", "misc": "2002-01-03 243-245 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86d db/books/collections/Stonebraker86/Stonebraker86d.html ingres/P243.pdf" }
-{ "id": 66, "dblpid": "books/aw/stonebraker86/Stonebraker86e", "title": "Extended Semantics for the Relational Model (Introduction to Section 5).", "authors": "Michael Stonebraker", "misc": "2002-01-03 313-316 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86e db/books/collections/Stonebraker86/Stonebraker86e.html ingres/P313.pdf" }
-{ "id": 67, "dblpid": "books/aw/stonebraker86/Stonebraker86f", "title": "Database Design (Introduction to Section 6).", "authors": "Michael Stonebraker", "misc": "2002-01-03 393-394 1986 The INGRES Papers db/books/collections/Stonebraker86.html#Stonebraker86f db/books/collections/Stonebraker86/Stonebraker86f.html ingres/P393.pdf" }
-{ "id": 68, "dblpid": "books/aw/stonebraker86/X86", "title": "Title, Preface, Contents.", "authors": "", "misc": "2002-01-03 1986 The INGRES Papers db/books/collections/Stonebraker86.html#X86 db/books/collections/Stonebraker86/X86.html ingres/frontmatter.pdf" }
-{ "id": 69, "dblpid": "books/aw/stonebraker86/X86a", "title": "References.", "authors": "", "misc": "2002-01-03 429-444 1986 The INGRES Papers db/books/collections/Stonebraker86.html#X86a db/books/collections/Stonebraker86/X86a.html ingres/P429.pdf" }
-{ "id": 70, "dblpid": "books/aw/Knuth86a", "title": "TeX  The Program", "authors": "Donald E. Knuth", "misc": "2002-01-03 Addison-Wesley 1986 0-201-13437-3" }
-{ "id": 71, "dblpid": "books/aw/AbiteboulHV95", "title": "Foundations of Databases.", "authors": "Serge Abiteboul Richard Hull Victor Vianu", "misc": "2002-01-03 Addison-Wesley 1995 0-201-53771-0 AHV/Toc.pdf ... ... journals/tods/AstrahanBCEGGKLMMPTWW76 books/bc/AtzeniA93 journals/tcs/AtzeniABM82 journals/jcss/AbiteboulB86 journals/csur/AtkinsonB87 conf/pods/AtzeniB87 journals/vldb/AbiteboulB95 conf/sigmod/AbiteboulB91 conf/dood/AtkinsonBDDMZ89 conf/vldb/AlbanoBGO93 ... conf/icdt/Abiteboul88 journals/ipl/Abiteboul89 conf/ds/Abrial74 journals/tods/AhoBU79 books/mk/minker88/AptBW88 conf/vldb/AroraC78 conf/stoc/AfratiC89 journals/tods/AlbanoCO85 conf/pods/AfratiCY91 conf/pods/AusielloDM85 conf/vldb/AbiteboulG85 journals/jacm/AjtaiG87 conf/focs/AjtaiG89 journals/tods/AbiteboulG91 ... ... journals/tods/AbiteboulH87 conf/sigmod/AbiteboulH88 ... conf/sigmod/AbiteboulK89 journals/tcs/AbiteboulKG91 journals/jcss/AbiteboulKRW95 conf/sigmod/AbiteboulLUW93 conf/pods/AtzeniP82 conf/pods/AfratiP87 conf/pods/AptP87 conf/wg/AndriesP91 conf/pods/AfratiPPRSU86 books/el/leeuwen90/Apt90 conf/ifip/Armstrong74 journals/siamcomp/AhoSSU81 journals/tods/AhoSU79 journals/siamcomp/AhoSU79 conf/pods/AbiteboulSV90 journals/is/AtzeniT93 conf/popl/AhoU79 conf/pods/AbiteboulV87 conf/jcdkb/AbiteboulV88 journals/jacm/AbiteboulV88 conf/pods/AbiteboulV88 journals/jacm/AbiteboulV89 journals/jcss/AbiteboulV90 journals/jcss/AbiteboulV91 conf/stoc/AbiteboulV91 journals/amai/AbiteboulV91 journals/jcss/AbiteboulV95 journals/jacm/AptE82 conf/coco/AbiteboulVV92 conf/iclp/AptB88 conf/oopsla/BobrowKKMSZ86 journals/tse/BatoryBGSTTW88 conf/mfcs/Bancilhon78 ... conf/db-workshops/Bancilhon85 books/el/leeuwen90/Barendregt90 ... journals/tods/BeeriB79 books/el/leeuwen90/BerstelB90 conf/icdt/BeneventanoB92 conf/vldb/BernsteinBC80 conf/vldb/BeeriBG78 conf/sigmod/BorgidaBMR89 journals/tods/BunemanC79 journals/jacm/BernsteinC81 conf/dbpl/BancilhonCD89 books/bc/tanselCGSS93/BaudinetCW93 conf/sigmod/BiskupDB79 journals/jacm/BeeriDFS84 books/mk/BancilhonDK92 conf/edbt/BryDM88 conf/pods/BunemanDW88 journals/jcss/BunemanDW91 journals/tods/Beeri80 journals/dke/Beeri90 ... journals/tods/Bernstein76 conf/lics/BidoitF87 journals/iandc/BidoitF91 conf/sigmod/BeeriFH77 conf/stoc/BeeriFMMUY81 journals/jacm/BeeriFMY83 journals/tods/BunemanFN82 journals/siamcomp/BernsteinG81 journals/iandc/BlassGK85 conf/ijcai/BrachmanGL85 journals/tods/BernsteinGWRR81 books/aw/BernsteinHG87 ... journals/tcs/Bidoit91 journals/tcs/Biskup80 conf/adbt/Biskup79 journals/tods/Biskup83 journals/tcs/BunemanJO91 journals/tods/BeeriK86 conf/pods/BeeriKBR87 conf/icdt/BidoitL90 journals/csur/BatiniL86 conf/sigmod/BlakeleyLT86 conf/vldb/BeeriM91 conf/sigmod/BlakeleyMG93 journals/siamcomp/BeeriMSU81 conf/pods/BancilhonMSU86 conf/pods/BeeriNRST87 journals/software/Borgida85 conf/icalp/BraP83 conf/fgcs/BalbinMR88 ... conf/pods/BeeriR87 journals/jlp/BalbinR87 conf/sigmod/BancilhonR86 books/mk/minker88/BancilhonR88 journals/jlp/BeeriR91 conf/vldb/BancilhonRS82 conf/pods/BeeriRSS92 conf/dood/Bry89 journals/tods/BancilhonS81 journals/cogsci/BrachmanS85 journals/tods/BergamaschiS92 conf/sigmod/BernsteinST75 conf/dbpl/TannenBN91 conf/icdt/TannenBW92 ... journals/jacm/BeeriV84 conf/icalp/BeeriV81 conf/adbt/BeeriV79 journals/siamcomp/BeeriV84 journals/iandc/BeeriV84 journals/jacm/BeeriV84 journals/tcs/BeeriV85 journals/ibmrd/ChamberlinAEGLMRW76 ... journals/iandc/Cardelli88 books/mk/Cattell94 conf/sigmod/CacaceCCTZ90 conf/vldb/CastilhoCF82 conf/adbt/CasanovaF82 conf/focs/CaiFI89 journals/jcss/CasanovaFP84 conf/stoc/CosmadakisGKV88 conf/dood/CorciuloGP93 books/sp/CeriGT90 conf/focs/ChandraH80 journals/jcss/ChandraH80 journals/jcss/ChandraH82 journals/jlp/ChandraH85 conf/popl/Chandra81 conf/adbt/Chang79 conf/pods/Chandra88 ... journals/tods/Chen76 conf/ride/ChenHM94 conf/icde/Chomicki92 conf/pods/Chomicki92 ... ... ... conf/stoc/CosmadakisK85 journals/acr/CosmadakisK86 ... journals/jcss/CosmadakisKS86 journals/jacm/CosmadakisKV90 ... conf/pods/CalvaneseL94 conf/adbt/Clark77 conf/stoc/ChandraLM81 conf/stoc/ChandraM77 conf/pods/ConsensM90 conf/sigmod/ConsensM93 conf/icdt/ConsensM90 journals/cacm/Codd70 conf/sigmod/Codd71a persons/Codd71a persons/Codd72 conf/ifip/Codd74 ... conf/sigmod/Codd79 journals/cacm/Codd82 ... conf/sigmod/Cohen89 journals/cacm/Cohen90 ... journals/jcss/Cook74 conf/pods/Cosmadakis83 conf/focs/Cosmadakis87 books/el/leeuwen90/Courcelle90a journals/jacm/CosmadakisP84 conf/edbt/CeriCGLLTZ88 ... conf/vldb/CeriT87 conf/vldb/CasanovaTF88 ... conf/pods/CasanovaV83 journals/siamcomp/ChandraV85 conf/pods/ChaudhuriV92 conf/pods/ChaudhuriV93 conf/pods/ChaudhuriV94 journals/csur/CardelliW85 conf/pods/ChenW89 conf/pods/CohenW89 conf/vldb/CeriW90 conf/vldb/CeriW91 conf/iclp/ChenW92 conf/vldb/CeriW93 ... conf/birthday/Dahlhaus87 conf/vldb/Date81 books/aw/Date86 ... conf/dbpl/Dayal89 journals/tods/DayalB82 journals/ibmrd/DelobelC73 conf/icde/DelcambreD89 ... journals/tods/Delobel78 journals/jacm/Demolombe92 journals/tods/DateF92 ... conf/vldb/DayalHL91 journals/jacm/Paola69a conf/caap/DahlhausM86 journals/acr/DAtriM86 journals/iandc/DahlhausM92 conf/sigmod/DerrMP93 conf/vldb/MaindrevilleS88 conf/pods/Dong92 conf/adbt/BraP82 ... conf/dbpl/DongS91 journals/iandc/DongS95 conf/dbpl/DongS93 conf/dbpl/DongS93 conf/icdt/DongT92 conf/vldb/DenninghoffV91 conf/pods/DenninghoffV93 ... ... books/acm/kim95/DayalHW95 ... conf/pods/EiterGM94 conf/pods/Escobar-MolanoHJ93 ... books/el/leeuwen90/Emerson90 books/bc/ElmasriN89 ... conf/icse/Eswaran76 conf/sigmod/EpsteinSW78 ... ... conf/vldb/Fagin77 journals/tods/Fagin77 conf/sigmod/Fagin79 journals/tods/Fagin81 journals/ipl/FaginV83 journals/jacm/Fagin82 journals/jacm/Fagin83 journals/tcs/Fagin93 books/sp/kimrb85/FurtadoC85 ... journals/jlp/Fitting85a journals/tcs/FischerJT83 journals/acr/FaginKUV86 conf/icdt/FernandezM92 journals/tods/FaginMU82 conf/vldb/FaloutsosNS91 ... journals/ai/Forgy82 ... conf/sigmod/Freytag87 ... journals/siamcomp/FischerT83 journals/siamcomp/FaginMUY83 conf/pods/FaginUV83 conf/icalp/FaginV84 ... ... ... ... conf/sigmod/GraefeD87 conf/ride/GatziuD94 conf/sigmod/GardarinM86 conf/sigmod/GyssensG88 journals/tcs/GinsburgH83a journals/jacm/GinsburgH86 ... books/bc/tanselCGSS93/Ginsburg93 books/fm/GareyJ79 journals/jacm/GrantJ82 conf/vldb/GehaniJ91 conf/vldb/GhandeharizadehHJCELLTZ93 journals/tods/GhandeharizadehHJ96 conf/vldb/GehaniJS92 ... conf/sigmod/GehaniJS92 ... conf/deductive/GuptaKM92 conf/pods/GurevichL82 conf/iclp/GelfondL88 conf/adbt/77 journals/csur/GallaireMN84 conf/pods/GrahneMR92 conf/sigmod/GuptaMS93 conf/lics/GaifmanMSV87 journals/jacm/GaifmanMSV93 journals/jacm/GrahamMV86 conf/csl/GradelO92 ... conf/pods/Gottlob87 conf/pods/GyssensPG90 conf/dood/GiannottiPSZ91 books/aw/GoldbergR83 journals/acr/GrahneR86 journals/ipl/Grant77 ... journals/iandc/Grandjean83 conf/vldb/Grahne84 ... journals/csur/Graefe93 books/sp/Greibach75 journals/tods/GoodmanS82 journals/jcss/GoodmanS84 conf/focs/GurevichS85 ... conf/pods/GrumbachS94 conf/sigmod/GangulyST90 ... journals/tcs/Gunter92 ... ... ... ... conf/pods/GrahamV84 conf/pods/GrumbachV91 conf/icde/GardarinV92 conf/sigmod/GraefeW89 ... journals/jacm/GinsburgZ82 conf/vldb/GottlobZ88 ... ... journals/sigmod/Hanson89 ... journals/cacm/Harel80 journals/tkde/HaasCLMWLLPCS90 conf/lics/Hella92 journals/iandc/Herrmann95 conf/pods/HirstH93 conf/vldb/HullJ91 conf/ewdw/HullJ90 journals/csur/HullK87 journals/tods/HudsonK89 conf/lics/HillebrandKM93 conf/nato/HillebrandKR93 conf/jcdkb/HsuLM88 journals/ipl/HoneymanLY80 journals/tods/HammerM81 conf/adbt/HenschenMN82 ... journals/jacm/HenschenN84 journals/jacm/Honeyman82 conf/sigmod/HullS89 conf/pods/HullS89 journals/acta/HullS94 journals/jcss/HullS93 conf/fodo/HullTY89 journals/jcss/Hull83 journals/jacm/Hull84 journals/tcs/Hull85 journals/siamcomp/Hull86 ... conf/vldb/Hulin89 ... journals/jacm/HullY84 conf/vldb/HullY90 conf/pods/HullY91 conf/sigmod/IoannidisK90 journals/jcss/ImielinskiL84 conf/adbt/Imielinski82 journals/jcss/Immerman82 journals/iandc/Immerman86 ... journals/siamcomp/Immerman87 conf/pods/ImielinskiN88 conf/vldb/IoannidisNSS92 conf/sigmod/ImielinskiNV91 conf/dood/ImielinskiNV91 conf/vldb/Ioannidis85 journals/jacm/Jacobs82 conf/dbpl/JacobsH91 journals/csur/JarkeK84 journals/jcss/JohnsonK84 conf/popl/JaffarL87 books/el/leeuwen90/Johnson90 journals/jacm/Joyner76 conf/pods/JaeschkeS82 ... books/mk/minker88/Kanellakis88 books/el/leeuwen90/Kanellakis90 conf/oopsla/KhoshafianC86 conf/edbt/KotzDM88 conf/jcdkb/Keller82 conf/pods/Keller85 journals/computer/Keller86 ... journals/tods/Kent79 ... journals/ngc/RohmerLK86 conf/tacs/KanellakisG94 conf/jcdkb/Kifer88 conf/pods/KanellakisKR90 conf/sigmod/KiferKS92 ... conf/icdt/KiferL86 books/aw/KimL89 ... journals/tods/Klug80 journals/jacm/Klug82 journals/jacm/Klug88 journals/jacm/KiferLW95 conf/kr/KatsunoM91 journals/ai/KatsunoM92 conf/jcdkb/KrishnamurthyN88 journals/csur/Knight89 ... journals/iandc/Kolaitis91 journals/ai/Konolige88 conf/ifip/Kowalski74 journals/jacm/Kowalski75 conf/bncod/Kowalski84 conf/vldb/KoenigP81 journals/tods/KlugP82 ... conf/pods/KolaitisP88 conf/pods/KiferRS88 conf/sigmod/KrishnamurthyRS88 books/mg/SilberschatzK91 conf/iclp/KempT88 conf/sigmod/KellerU84 conf/dood/Kuchenhoff91 ... journals/jlp/Kunen87 conf/iclp/Kunen88 conf/pods/Kuper87 conf/pods/Kuper88 conf/ppcp/Kuper93 conf/pods/KuperV84 conf/stoc/KolaitisV87 journals/tcs/KarabegV90 journals/iandc/KolaitisV90 conf/pods/KolaitisV90 journals/tods/KarabegV91 journals/iandc/KolaitisV92 journals/tcs/KuperV93 journals/tods/KuperV93 journals/tse/KellerW85 conf/pods/KiferW89 conf/jcdkb/Lang88 books/el/Leeuwen90 ... journals/jcss/Leivant89 ... journals/iandc/Leivant90 ... conf/db-workshops/Levesque82 journals/ai/Levesque84 conf/mfdbs/Libkin91 conf/er/Lien79 journals/jacm/Lien82 books/mk/minker88/Lifschitz88 ... journals/tcs/Lindell91 journals/tods/Lipski79 journals/jacm/Lipski81 journals/tcs/LeratL86 journals/cj/LeveneL90 books/sp/Lloyd87 conf/pods/LakshmananM89 conf/tlca/LeivantM93 conf/sigmod/LaverMG83 conf/pods/LiptonN90 journals/jcss/LucchesiO78 conf/sigmod/Lohman88 ... conf/ijcai/Lozinskii85 books/ph/LewisP81 ... conf/sigmod/LecluseRV88 journals/is/LipeckS87 journals/jlp/LloydST87 journals/tods/LingTK81 conf/sigmod/LyngbaekV87 conf/dood/LefebvreV89 conf/pods/LibkinW93 conf/dbpl/LibkinW93 journals/jacm/Maier80 books/cs/Maier83 ... conf/vldb/Makinouchi77 conf/icalp/Makowsky81 ... conf/icdt/Malvestuto86 conf/aaai/MacGregorB92 journals/tods/MylopoulosBW80 conf/sigmod/McCarthyD89 journals/csur/MishraE92 conf/sigmod/MumickFPR90 books/mk/Minker88 journals/jlp/Minker88 conf/vldb/MillerIR93 journals/is/MillerIR94 journals/iandc/Mitchell83 conf/pods/Mitchell83 conf/vldb/MendelzonM79 journals/tods/MaierMS79 journals/jcss/MaierMSU80 conf/pods/MendelzonMW94 journals/debu/MorrisNSUG87 journals/ai/Moore85 conf/vldb/Morgenstern83 conf/pods/Morris88 ... conf/pods/MannilaR85 ... journals/jlp/MinkerR90 books/aw/MannilaR92 journals/acr/MaierRW86 ... journals/tods/MarkowitzS92 conf/pods/Marchetti-SpaccamelaPS87 journals/jacm/MaierSY81 conf/iclp/MorrisUG86 journals/tods/MaierUV84 conf/iclp/MorrisUG86 journals/acta/MakowskyV86 books/bc/MaierW88 books/mk/minker88/ManchandraW88 conf/pods/Naughton86 conf/sigmod/NgFS91 ... conf/vldb/Nejdl87 conf/adbt/NicolasM77 conf/sigmod/Nicolas78 journals/acta/Nicolas82 conf/ds/76 conf/pods/NaqviK88 journals/tods/NegriPS91 conf/vldb/NaughtonRSU89 conf/pods/NaughtonS87 ... ... conf/vldb/Osborn79 ... journals/tods/OzsoyogluY87 conf/adbt/Paige82 ... books/cs/Papadimitriou86 ... journals/ipl/Paredaens78 ... books/sp/ParedaensBGG89 journals/ai/Andersen91 books/el/leeuwen90/Perrin90 journals/ins/Petrov89 conf/pods/ParedaensG88 conf/pods/PatnaikI94 conf/adbt/ParedaensJ79 journals/csur/PeckhamM88 ... ... conf/sigmod/ParkerP80 ... conf/iclp/Przymusinski88 conf/pods/Przymusinski89 ... conf/vldb/ParkerSV92 conf/aaai/PearlV87 journals/ai/PereiraW80a conf/pods/PapadimitriouY92 journals/tkde/QianW91 ... journals/jlp/Ramakrishnan91 conf/pods/RamakrishnanBS87 ... conf/adbt/Reiter77 journals/ai/Reiter80 conf/db-workshops/Reiter82 journals/jacm/Reiter86 journals/tods/Rissanen77 conf/mfcs/Rissanen78 conf/pods/Rissanen82 ... journals/ngc/RohmerLK86 journals/jacm/Robinson65 ... conf/pods/Ross89 ... ... conf/sigmod/RoweS79 conf/sigmod/RichardsonS91 journals/debu/RamamohanaraoSBPNTZD87 conf/vldb/RamakrishnanSS92 conf/sigmod/RamakrishnanSSS93 conf/pods/RamakrishnanSUV89 journals/jcss/RamakrishnanSUV93 journals/jlp/RamakrishnanU95 conf/sigmod/SelingerACLP79 conf/sigmod/Sagiv81 journals/tods/Sagiv83 books/mk/minker88/Sagiv88 conf/slp/Sagiv90 conf/sigmod/Sciore81 journals/jacm/Sciore82 conf/pods/Sciore83 journals/acr/Sciore86 journals/jacm/SagivDPF81 conf/pods/X89 ... journals/ai/SmithG85 books/mk/minker88/Shepherdson88 journals/tods/Shipman81 conf/pods/Shmueli87 conf/iclp/SekiI88 conf/sigmod/ShmueliI84 journals/tc/Sickel76 journals/jsc/Siekmann89 conf/sigmod/StonebrakerJGP90 conf/vldb/SimonKM92 journals/csur/ShethL90 conf/pods/SeibL91 conf/sigmod/SuLRD93 conf/adbt/SilvaM79 journals/sigmod/Snodgrass90 journals/sigmod/Soo91 conf/pods/SuciuP94 conf/sigmod/StonebrakerR86 conf/slp/SudarshanR93 conf/pods/SagivS86 journals/cacm/Stonebraker81 books/mk/Stonebraker88 journals/tkde/Stonebraker92 books/aw/Stroustrup91 journals/jacm/SadriU82 conf/vldb/Su91 conf/pods/SagivV89 journals/jacm/SagivW82 journals/tods/StonebrakerWKH76 journals/jacm/SagivY80 conf/pods/SaccaZ86 journals/tcs/SaccaZ88 ... conf/pods/SaccaZ90 ... ... books/bc/TanselCGJSS93 ... journals/acr/ThomasF86 ... ... ... ... journals/tcs/Topor87 ... books/mk/minker88/ToporS88 ... journals/siamcomp/TarjanY84 journals/csur/TeoreyYF86 journals/algorithmica/UllmanG88 conf/pods/Ullman82 books/cs/Ullman82 journals/tods/Ullman85 books/cs/Ullman88 conf/pods/Ullman89 books/cs/Ullman89 conf/sigmod/Gelder86 ... conf/pods/BusscheG92 conf/focs/BusscheGAG92 conf/pods/BusscheP91 conf/slp/Gelder86 conf/pods/Gelder89 conf/pods/GelderRS88 journals/jacm/GelderRS91 journals/tods/GelderT91 journals/ipl/Vardi81 conf/stoc/Vardi82 conf/focs/Vardi82 journals/acta/Vardi83 journals/jcss/Vardi84 conf/pods/Vardi85 conf/pods/Vardi86 journals/jcss/Vardi86 ... conf/pods/Vardi88 conf/sigmod/Vassiliou79 ... ... journals/jacm/EmdenK76 conf/nf2/SchollABBGPRV87 journals/jacm/Vianu87 journals/acta/Vianu87 conf/eds/Vieille86 conf/iclp/Vieille87 ... conf/eds/Vieille88 journals/tcs/Vieille89 ... journals/tcs/VianuV92 conf/sigmod/WidomF90 conf/icde/WangH92 conf/pos/WidjojoHW90 journals/computer/Wiederhold92 conf/pods/Wilkins86 conf/pods/Winslett88 conf/sigmod/WolfsonO90 conf/pods/Wong93 conf/sigmod/WolfsonS88 journals/ibmrd/WangW75 journals/tods/WongY76 conf/vldb/Yannakakis81 journals/csur/YuC84 ... journals/jcss/YannakakisP82 ... journals/tods/Zaniolo82 journals/jcss/Zaniolo84 ... conf/edbt/ZhouH90 journals/ibmsj/Zloof77 books/mk/ZdonikM90 db/books/dbtext/abiteboul95.html" }
-{ "id": 72, "dblpid": "books/aw/Lamport86", "title": "LaTeX  User's Guide & Reference Manual", "authors": "Leslie Lamport", "misc": "2002-01-03 Addison-Wesley 1986 0-201-15790-X" }
-{ "id": 73, "dblpid": "books/aw/AhoHU74", "title": "The Design and Analysis of Computer Algorithms.", "authors": "Alfred V. Aho John E. Hopcroft Jeffrey D. Ullman", "misc": "2002-01-03 Addison-Wesley 1974 0-201-00029-6" }
-{ "id": 74, "dblpid": "books/aw/Lamport2002", "title": "Specifying Systems, The TLA+ Language and Tools for Hardware and Software Engineers", "authors": "Leslie Lamport", "misc": "2005-07-28 Addison-Wesley 2002 0-3211-4306-X http //research.microsoft.com/users/lamport/tla/book.html" }
-{ "id": 75, "dblpid": "books/aw/AhoHU83", "title": "Data Structures and Algorithms.", "authors": "Alfred V. Aho John E. Hopcroft Jeffrey D. Ullman", "misc": "2002-01-03 Addison-Wesley 1983 0-201-00023-7" }
-{ "id": 76, "dblpid": "books/aw/LewisBK01", "title": "Databases and Transaction Processing  An Application-Oriented Approach", "authors": "Philip M. Lewis Arthur J. Bernstein Michael Kifer", "misc": "2002-01-03 Addison-Wesley 2001 0-201-70872-8" }
-{ "id": 77, "dblpid": "books/aw/AhoKW88", "title": "The AWK Programming Language", "authors": "Alfred V. Aho Brian W. Kernighan Peter J. Weinberger", "misc": "2002-01-03 Addison-Wesley 1988" }
-{ "id": 78, "dblpid": "books/aw/LindholmY97", "title": "The Java Virtual Machine Specification", "authors": "Tim Lindholm Frank Yellin", "misc": "2002-01-28 Addison-Wesley 1997 0-201-63452-X" }
-{ "id": 79, "dblpid": "books/aw/AhoSU86", "title": "Compilers  Princiles, Techniques, and Tools.", "authors": "Alfred V. Aho Ravi Sethi Jeffrey D. Ullman", "misc": "2002-01-03 Addison-Wesley 1986 0-201-10088-6" }
-{ "id": 80, "dblpid": "books/aw/Sedgewick83", "title": "Algorithms", "authors": "Robert Sedgewick", "misc": "2002-01-03 Addison-Wesley 1983 0-201-06672-6" }
-{ "id": 81, "dblpid": "journals/siamcomp/AspnesW96", "title": "Randomized Consensus in Expected O(n log² n) Operations Per Processor.", "authors": "James Aspnes Orli Waarts", "misc": "2002-01-03 1024-1044 1996 25 SIAM J. Comput. 5 db/journals/siamcomp/siamcomp25.html#AspnesW96" }
-{ "id": 82, "dblpid": "conf/focs/AspnesW92", "title": "Randomized Consensus in Expected O(n log ^2 n) Operations Per Processor", "authors": "James Aspnes Orli Waarts", "misc": "2006-04-25 137-146 conf/focs/FOCS33 1992 FOCS db/conf/focs/focs92.html#AspnesW92" }
-{ "id": 83, "dblpid": "journals/siamcomp/Bloniarz83", "title": "A Shortest-Path Algorithm with Expected Time O(n² log n log* n).", "authors": "Peter A. Bloniarz", "misc": "2002-01-03 588-600 1983 12 SIAM J. Comput. 3 db/journals/siamcomp/siamcomp12.html#Bloniarz83" }
-{ "id": 84, "dblpid": "conf/stoc/Bloniarz80", "title": "A Shortest-Path Algorithm with Expected Time O(n^2 log n log ^* n)", "authors": "Peter A. Bloniarz", "misc": "2006-04-25 378-384 conf/stoc/STOC12 1980 STOC db/conf/stoc/stoc80.html#Bloniarz80" }
-{ "id": 85, "dblpid": "journals/siamcomp/Megiddo83a", "title": "Linear-Time Algorithms for Linear Programming in R³ and Related Problems.", "authors": "Nimrod Megiddo", "misc": "2002-01-03 759-776 1983 12 SIAM J. Comput. 4 db/journals/siamcomp/siamcomp12.html#Megiddo83a" }
-{ "id": 86, "dblpid": "conf/focs/Megiddo82", "title": "Linear-Time Algorithms for Linear Programming in R^3 and Related Problems", "authors": "Nimrod Megiddo", "misc": "2006-04-25 329-338 conf/focs/FOCS23 1982 FOCS db/conf/focs/focs82.html#Megiddo82" }
-{ "id": 87, "dblpid": "journals/siamcomp/MoffatT87", "title": "An All Pairs Shortest Path Algorithm with Expected Time O(n² log n).", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2002-01-03 1023-1031 1987 16 SIAM J. Comput. 6 db/journals/siamcomp/siamcomp16.html#MoffatT87" }
-{ "id": 88, "dblpid": "conf/focs/MoffatT85", "title": "An All Pairs Shortest Path Algorithm with Expected Running Time O(n^2 log n)", "authors": "Alistair Moffat Tadao Takaoka", "misc": "2006-04-25 101-105 conf/focs/FOCS26 1985 FOCS db/conf/focs/focs85.html#MoffatT85" }
-{ "id": 89, "dblpid": "conf/icip/SchonfeldL98", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-11-05 123-127 1998 ICIP (3) db/conf/icip/icip1998-3.html#SchonfeldL98" }
-{ "id": 90, "dblpid": "conf/hicss/SchonfeldL99", "title": "VORTEX  Video Retrieval and Tracking from Compressed Multimedia Databases ¾ Visual Search Engine.", "authors": "Dan Schonfeld Dan Lelescu", "misc": "2002-01-03 1999 HICSS http //computer.org/proceedings/hicss/0001/00013/00013006abs.htm db/conf/hicss/hicss1999-3.html#SchonfeldL99" }
-{ "id": 91, "dblpid": "journals/corr/abs-0802-2861", "title": "Geometric Set Cover and Hitting Sets for Polytopes in $R^3$", "authors": "Sören Laue", "misc": "2008-03-03 http //arxiv.org/abs/0802.2861 2008 CoRR abs/0802.2861 db/journals/corr/corr0802.html#abs-0802-2861 informal publication" }
-{ "id": 92, "dblpid": "conf/stacs/Laue08", "title": "Geometric Set Cover and Hitting Sets for Polytopes in R³.", "authors": "Sören Laue", "misc": "2008-03-04 2008 STACS 479-490 http //drops.dagstuhl.de/opus/volltexte/2008/1367 conf/stacs/2008 db/conf/stacs/stacs2008.html#Laue08" }
-{ "id": 93, "dblpid": "journals/iandc/IbarraJCR91", "title": "Some Classes of Languages in NC¹", "authors": "Oscar H. Ibarra Tao Jiang Jik H. Chang Bala Ravikumar", "misc": "2006-04-25 86-106 Inf. Comput. January 1991 90 1 db/journals/iandc/iandc90.html#IbarraJCR91" }
-{ "id": 94, "dblpid": "conf/awoc/IbarraJRC88", "title": "On Some Languages in NC.", "authors": "Oscar H. Ibarra Tao Jiang Bala Ravikumar Jik H. Chang", "misc": "2002-08-06 64-73 1988 conf/awoc/1988 AWOC db/conf/awoc/awoc88.html#IbarraJRC88" }
-{ "id": 95, "dblpid": "journals/jacm/GalilHLSW87", "title": "An O(n³log n) deterministic and an O(n³) Las Vegs isomorphism test for trivalent graphs.", "authors": "Zvi Galil Christoph M. Hoffmann Eugene M. Luks Claus-Peter Schnorr Andreas Weber", "misc": "2003-11-20 513-531 1987 34 J. ACM 3 http //doi.acm.org/10.1145/28869.28870 db/journals/jacm/jacm34.html#GalilHLSW87" }
-{ "id": 96, "dblpid": "conf/focs/GalilHLSW82", "title": "An O(n^3 log n) Deterministic and an O(n^3) Probabilistic Isomorphism Test for Trivalent Graphs", "authors": "Zvi Galil Christoph M. Hoffmann Eugene M. Luks Claus-Peter Schnorr Andreas Weber", "misc": "2006-04-25 118-125 conf/focs/FOCS23 1982 FOCS db/conf/focs/focs82.html#GalilHLSW82" }
-{ "id": 97, "dblpid": "journals/jacm/GalilT88", "title": "An O(n²(m + n log n)log n) min-cost flow algorithm.", "authors": "Zvi Galil Éva Tardos", "misc": "2003-11-20 374-386 1988 35 J. ACM 2 http //doi.acm.org/10.1145/42282.214090 db/journals/jacm/jacm35.html#GalilT88" }
-{ "id": 98, "dblpid": "conf/focs/GalilT86", "title": "An O(n^2 (m + n log n) log n) Min-Cost Flow Algorithm", "authors": "Zvi Galil Éva Tardos", "misc": "2006-04-25 1-9 conf/focs/FOCS27 1986 FOCS db/conf/focs/focs86.html#GalilT86" }
-{ "id": 99, "dblpid": "series/synthesis/2009Weintraub", "title": "Jordan Canonical Form  Theory and Practice", "authors": "Steven H. Weintraub", "misc": "2009-09-06 Jordan Canonical Form  Theory and Practice http //dx.doi.org/10.2200/S00218ED1V01Y200908MAS006 http //dx.doi.org/10.2200/S00218ED1V01Y200908MAS006 2009 Synthesis Lectures on Mathematics & Statistics Morgan & Claypool Publishers" }
-{ "id": 100, "dblpid": "series/synthesis/2009Brozos", "title": "The Geometry of Walker Manifolds", "authors": "Miguel Brozos-Vázquez Eduardo García-Río Peter Gilkey Stana Nikcevic Rámon Vázquez-Lorenzo", "misc": "2009-09-06 The Geometry of Walker Manifolds http //dx.doi.org/10.2200/S00197ED1V01Y200906MAS005 http //dx.doi.org/10.2200/S00197ED1V01Y200906MAS005 2009 Synthesis Lectures on Mathematics & Statistics Morgan & Claypool Publishers" }
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_1.adm b/asterix-app/src/test/resources/runtimets/results/scan/issue238_query_2/issue238_query_2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/scan/issue238_query_1.adm
copy to asterix-app/src/test/resources/runtimets/results/scan/issue238_query_2/issue238_query_2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/alltypes_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/lltypes_01/lltypes_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/alltypes_01.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/lltypes_01/lltypes_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_01/numeric_types_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/numeric_types_01.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/numeric_types_01/numeric_types_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_02.adm b/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_02.adm
deleted file mode 100644
index 597c28a..0000000
--- a/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_02.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "id": 10, "int8Field": 48i8, "int16Field": -16i16, "int32Field": -32, "int64Field": -64i64, "floatField": 64.0f, "doubleField": 64.0d, "int8Field2": 48i8, "int16Field2": 16i16, "int32Field2": 32, "int64Field2": 64i64, "int8Field3": 48i8, "int16Field3": 16i16, "int32Field3": 32, "int64Field3": 64i64, "int8Field4": -48i8, "int16Field4": -16i16, "int32Field4": -32, "int64Field4": -64i64, "floatco2": 0.64f, "doubleco2": 0.64d, "floatco3": 64.1f, "doubleco3": 64.1d, "floatco4": 4.9999999E10f, "doubleco4": 5.0E10d, "floatco5": 4.9999999E10f, "doubleco5": 5.0E10d, "floatco6": 5.0E-10f, "doubleco6": 5.0E-10d }
-{ "id": 11, "int8Field": null, "int16Field": null, "int32Field": null, "int64Field": null, "floatField": null, "doubleField": null }
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/numeric_types_02/numeric_types_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/scan/numeric_types_01.adm
copy to asterix-app/src/test/resources/runtimets/results/scan/numeric_types_02/numeric_types_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/spatial_types_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/spatial_types_01/spatial_types_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/spatial_types_01.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/spatial_types_01/spatial_types_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/spatial_types_02.adm b/asterix-app/src/test/resources/runtimets/results/scan/spatial_types_02/spatial_types_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/spatial_types_02.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/spatial_types_02/spatial_types_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/temp_types_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/temp_types_01/temp_types_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/temp_types_01.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/temp_types_01/temp_types_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/temp_types_02.adm b/asterix-app/src/test/resources/runtimets/results/scan/temp_types_02/temp_types_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/scan/temp_types_02.adm
rename to asterix-app/src/test/resources/runtimets/results/scan/temp_types_02/temp_types_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/semistructured/count-nullable.adm b/asterix-app/src/test/resources/runtimets/results/semistructured/count-nullable/count-nullable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/semistructured/count-nullable.adm
rename to asterix-app/src/test/resources/runtimets/results/semistructured/count-nullable/count-nullable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/semistructured/cust-filter.adm b/asterix-app/src/test/resources/runtimets/results/semistructured/cust-filter/cust-filter.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/semistructured/cust-filter.adm
rename to asterix-app/src/test/resources/runtimets/results/semistructured/cust-filter/cust-filter.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/semistructured/has-param1.adm b/asterix-app/src/test/resources/runtimets/results/semistructured/has-param1/has-param1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/semistructured/has-param1.adm
rename to asterix-app/src/test/resources/runtimets/results/semistructured/has-param1/has-param1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_ints/edit-distance-check_ints.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_ints.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_ints/edit-distance-check_ints.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_strings.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_strings.adm
deleted file mode 100644
index 9aff56c..0000000
--- a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_strings.adm
+++ /dev/null
@@ -1,4 +0,0 @@
-[ true, 3 ]
-[ true, 3 ]
-[ false, 2147483647 ]
-[ false, 2147483647 ]
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_strings/edit-distance-check_strings.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_ints.adm
copy to asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-check_strings/edit-distance-check_strings.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-list-is-filterable.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-list-is-filterable.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-string-is-filterable.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-string-is-filterable.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_ints/edit-distance_ints.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_ints.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_ints/edit-distance_ints.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_strings.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_strings.adm
deleted file mode 100644
index a5c8806..0000000
--- a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_strings.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-3
-3
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_strings/edit-distance_strings.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_ints.adm
copy to asterix-app/src/test/resources/runtimets/results/similarity/edit-distance_strings/edit-distance_strings.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-edit-distance.adm b/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-edit-distance.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccar/fuzzyeq-similarity-jaccar.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm
copy to asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccar/fuzzyeq-similarity-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/prefix-len-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/similarity/prefix-len-jaccar/prefix-len-jaccar.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/prefix-len-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/prefix-len-jaccar/prefix-len-jaccar.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_ints.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_query.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_query.adm
deleted file mode 100644
index 5bf6ae0..0000000
--- a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_query.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 9, "dblpid": "books/acm/kim95/Kaiser95", "title": "Cooperative Transactions for Multiuser Environments.", "authors": "Gail E. Kaiser", "misc": "2002-01-03 409-433 1995 Modern Database Systems db/books/collections/kim95.html#Kaiser95" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm
copy to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_strings.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_strings.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix-check.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix-check.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_ints.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_query.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_query.adm
deleted file mode 100644
index 5bf6ae0..0000000
--- a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_query.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 9, "dblpid": "books/acm/kim95/Kaiser95", "title": "Cooperative Transactions for Multiuser Environments.", "authors": "Gail E. Kaiser", "misc": "2002-01-03 409-433 1995 Modern Database Systems db/books/collections/kim95.html#Kaiser95" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm
copy to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_strings.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_strings.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_ints.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_query.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_query.adm
deleted file mode 100644
index 5bf6ae0..0000000
--- a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_query.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 9, "dblpid": "books/acm/kim95/Kaiser95", "title": "Cooperative Transactions for Multiuser Environments.", "authors": "Gail E. Kaiser", "misc": "2002-01-03 409-433 1995 Modern Database Systems db/books/collections/kim95.html#Kaiser95" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm
copy to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_strings.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_strings.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_ints.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_ints/similarity-jaccard_ints.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_ints.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_ints/similarity-jaccard_ints.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_query.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_query.adm
deleted file mode 100644
index 5bf6ae0..0000000
--- a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_query.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 9, "dblpid": "books/acm/kim95/Kaiser95", "title": "Cooperative Transactions for Multiuser Environments.", "authors": "Gail E. Kaiser", "misc": "2002-01-03 409-433 1995 Modern Database Systems db/books/collections/kim95.html#Kaiser95" }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_query/similarity-jaccard_query.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/fuzzyeq-similarity-jaccard.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_query/similarity-jaccard_query.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_strings.adm b/asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_strings/similarity-jaccard_strings.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_strings.adm
rename to asterix-app/src/test/resources/runtimets/results/similarity/similarity-jaccard_strings/similarity-jaccard_strings.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation-with-filtering.adm b/asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation-with-filtering.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation.adm b/asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation/cell-aggregation.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/cell-aggregation/cell-aggregation.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/circle-intersect-circle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/circle-intersect-circle/circle-intersect-circle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/circle-intersect-circle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/circle-intersect-circle/circle-intersect-circle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/circle_accessor.adm b/asterix-app/src/test/resources/runtimets/results/spatial/circle_accessor/circle_accessor.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/circle_accessor.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/circle_accessor/circle_accessor.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/create-rtree-index.adm b/asterix-app/src/test/resources/runtimets/results/spatial/create-rtree-index/create-rtree-index.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/create-rtree-index.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/create-rtree-index/create-rtree-index.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/distance-between-points.adm b/asterix-app/src/test/resources/runtimets/results/spatial/istance-between-points/istance-between-points.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/distance-between-points.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/istance-between-points/istance-between-points.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-circle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-circle/line-intersect-circle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-circle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-circle/line-intersect-circle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-line.adm b/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-line/line-intersect-line.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-line.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-line/line-intersect-line.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-polygon.adm b/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-polygon/line-intersect-polygon.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-polygon.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-polygon/line-intersect-polygon.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-rectangle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-rectangle/line-intersect-rectangle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-rectangle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/line-intersect-rectangle/line-intersect-rectangle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/line_accessor.adm b/asterix-app/src/test/resources/runtimets/results/spatial/line_accessor/line_accessor.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/line_accessor.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/line_accessor/line_accessor.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/point-equals-point.adm b/asterix-app/src/test/resources/runtimets/results/spatial/point-equals-point/point-equals-point.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/point-equals-point.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/point-equals-point/point-equals-point.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/point-in-circle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/point-in-circle/point-in-circle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/point-in-circle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/point-in-circle/point-in-circle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/point-in-polygon.adm b/asterix-app/src/test/resources/runtimets/results/spatial/point-in-polygon/point-in-polygon.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/point-in-polygon.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/point-in-polygon/point-in-polygon.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/point-in-rectangle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/point-in-rectangle/point-in-rectangle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/point-in-rectangle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/point-in-rectangle/point-in-rectangle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/point-on-line.adm b/asterix-app/src/test/resources/runtimets/results/spatial/point-on-line/point-on-line.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/point-on-line.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/point-on-line/point-on-line.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/point_accessor.adm b/asterix-app/src/test/resources/runtimets/results/spatial/point_accessor/point_accessor.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/point_accessor.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/point_accessor/point_accessor.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-circle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-circle/polygon-intersect-circle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-circle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-circle/polygon-intersect-circle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-polygon.adm b/asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-polygon.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-rectangle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-rectangle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/polygon_accessor.adm b/asterix-app/src/test/resources/runtimets/results/spatial/polygon_accessor/polygon_accessor.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/polygon_accessor.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/polygon_accessor/polygon_accessor.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-circle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-circle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-rectangle.adm b/asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-rectangle.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/rectangle_accessor.adm b/asterix-app/src/test/resources/runtimets/results/spatial/rectangle_accessor/rectangle_accessor.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/rectangle_accessor.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/rectangle_accessor/rectangle_accessor.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/spatial/spatial-area.adm b/asterix-app/src/test/resources/runtimets/results/spatial/spatial-are/spatial-are.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/spatial/spatial-area.adm
rename to asterix-app/src/test/resources/runtimets/results/spatial/spatial-are/spatial-are.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string1.adm b/asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string1/codepoint-to-string1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string1/codepoint-to-string1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string2.adm b/asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string2/codepoint-to-string2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string2.adm
rename to asterix-app/src/test/resources/runtimets/results/string/codepoint-to-string2/codepoint-to-string2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/concat_01.adm b/asterix-app/src/test/resources/runtimets/results/string/concat_01/concat_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/concat_01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/concat_01/concat_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/concat_02.adm b/asterix-app/src/test/resources/runtimets/results/string/concat_02/concat_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/concat_02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/concat_02/concat_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/contains_01.adm b/asterix-app/src/test/resources/runtimets/results/string/contains_01/contains_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/contains_01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/contains_01/contains_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/cpttostr01.adm b/asterix-app/src/test/resources/runtimets/results/string/cpttostr01/cpttostr01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/cpttostr01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/cpttostr01/cpttostr01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/cpttostr02.adm b/asterix-app/src/test/resources/runtimets/results/string/cpttostr02/cpttostr02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/cpttostr02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/cpttostr02/cpttostr02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/cpttostr04.adm b/asterix-app/src/test/resources/runtimets/results/string/cpttostr04/cpttostr04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/cpttostr04.adm
rename to asterix-app/src/test/resources/runtimets/results/string/cpttostr04/cpttostr04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with1/end-with1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/end-with1/end-with1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with2.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with2.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/end-with2.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with2/end-with2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/end-with2/end-with2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with3.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with3.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/end-with3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with3/end-with3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/end-with3/end-with3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with4.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with4.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/end-with4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with4/end-with4.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/end-with4/end-with4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with5.adm b/asterix-app/src/test/resources/runtimets/results/string/end-with5/end-with5.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/end-with5.adm
rename to asterix-app/src/test/resources/runtimets/results/string/end-with5/end-with5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/ends-with_01.adm b/asterix-app/src/test/resources/runtimets/results/string/ends-with_01/ends-with_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/ends-with_01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/ends-with_01/ends-with_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/endwith02.adm b/asterix-app/src/test/resources/runtimets/results/string/endwith02/endwith02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/endwith02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/endwith02/endwith02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/endwith03.adm b/asterix-app/src/test/resources/runtimets/results/string/endwith03/endwith03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/endwith03.adm
rename to asterix-app/src/test/resources/runtimets/results/string/endwith03/endwith03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/length_01.adm b/asterix-app/src/test/resources/runtimets/results/string/length_01/length_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/length_01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/length_01/length_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/length_02.adm b/asterix-app/src/test/resources/runtimets/results/string/length_02.adm
deleted file mode 100644
index 930236d..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/length_02.adm
+++ /dev/null
@@ -1,8 +0,0 @@
-3
-6
-6
-5
-5
-5
-7
-6
diff --git a/asterix-app/src/test/resources/runtimets/results/flwor/ret-01.adm b/asterix-app/src/test/resources/runtimets/results/string/length_02/length_02.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/flwor/ret-01.adm
copy to asterix-app/src/test/resources/runtimets/results/string/length_02/length_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/like_01.adm b/asterix-app/src/test/resources/runtimets/results/string/like_01/like_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/like_01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/like_01/like_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/like_null.adm b/asterix-app/src/test/resources/runtimets/results/string/like_null/like_null.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/like_null.adm
rename to asterix-app/src/test/resources/runtimets/results/string/like_null/like_null.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/lowercase.adm b/asterix-app/src/test/resources/runtimets/results/string/lowercase/lowercase.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/lowercase.adm
rename to asterix-app/src/test/resources/runtimets/results/string/lowercase/lowercase.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches2.adm b/asterix-app/src/test/resources/runtimets/results/string/matches2.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/matches2.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches21.adm b/asterix-app/src/test/resources/runtimets/results/string/matches21.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/matches21.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches22.adm b/asterix-app/src/test/resources/runtimets/results/string/matches22.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/matches22.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches23.adm b/asterix-app/src/test/resources/runtimets/results/string/matches23.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/matches23.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches3.adm b/asterix-app/src/test/resources/runtimets/results/string/matches3.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/matches3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/replace1.adm b/asterix-app/src/test/resources/runtimets/results/string/replace1/replace1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/replace1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/replace1/replace1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/replace2.adm b/asterix-app/src/test/resources/runtimets/results/string/replace2/replace2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/replace2.adm
rename to asterix-app/src/test/resources/runtimets/results/string/replace2/replace2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/replace21.adm b/asterix-app/src/test/resources/runtimets/results/string/replace21/replace21.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/replace21.adm
rename to asterix-app/src/test/resources/runtimets/results/string/replace21/replace21.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/replace22.adm b/asterix-app/src/test/resources/runtimets/results/string/replace22/replace22.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/replace22.adm
rename to asterix-app/src/test/resources/runtimets/results/string/replace22/replace22.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/replace3.adm b/asterix-app/src/test/resources/runtimets/results/string/replace3/replace3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/replace3.adm
rename to asterix-app/src/test/resources/runtimets/results/string/replace3/replace3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/start-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with1.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/start-with1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with1/start-with1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/start-with1/start-with1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/start-with2.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with2.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/start-with2.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with2/start-with2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/start-with2/start-with2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/start-with3.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with3.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/start-with3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with3/start-with3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/start-with3/start-with3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/start-with4.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with4.adm
deleted file mode 100644
index c13d3dc..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/start-with4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "f1": true, "f2": false, "f3": true, "f4": false, "f5": true, "f6": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with5.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with4/start-with4.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with5.adm
copy to asterix-app/src/test/resources/runtimets/results/string/start-with4/start-with4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/start-with5.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with5.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/start-with5.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/start-with5/start-with5.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/start-with5/start-with5.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/starts-with_01.adm b/asterix-app/src/test/resources/runtimets/results/string/starts-with_01.adm
deleted file mode 100644
index f849211..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/starts-with_01.adm
+++ /dev/null
@@ -1 +0,0 @@
-[ false, true ]
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/string/ends-with_01.adm b/asterix-app/src/test/resources/runtimets/results/string/starts-with_01/starts-with_01.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/ends-with_01.adm
copy to asterix-app/src/test/resources/runtimets/results/string/starts-with_01/starts-with_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/startwith02.adm b/asterix-app/src/test/resources/runtimets/results/string/startwith02/startwith02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/startwith02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/startwith02/startwith02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/startwith03.adm b/asterix-app/src/test/resources/runtimets/results/string/startwith03/startwith03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/startwith03.adm
rename to asterix-app/src/test/resources/runtimets/results/string/startwith03/startwith03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strconcat01.adm b/asterix-app/src/test/resources/runtimets/results/string/strconcat01/strconcat01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strconcat01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strconcat01/strconcat01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strconcat02.adm b/asterix-app/src/test/resources/runtimets/results/string/strconcat02/strconcat02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strconcat02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strconcat02/strconcat02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-concat1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-concat1/string-concat1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/string-concat1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/string-concat1/string-concat1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-equal-true1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal-true1.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/string-equal-true1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal-true1/string-equal-true1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/string-equal-true1/string-equal-true1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-equal1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal1.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/string-equal1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal1/string-equal1.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/string-equal1/string-equal1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-equal2.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal2.adm
deleted file mode 100644
index 538da31..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/string-equal2.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": true }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal2/string-equal2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/string-equal2/string-equal2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-equal3.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal3.adm
deleted file mode 100644
index ea9ca72..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/string-equal3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": false }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal3/string-equal3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/string-equal3/string-equal3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-equal4.adm b/asterix-app/src/test/resources/runtimets/results/string/string-equal4/string-equal4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/string-equal4.adm
rename to asterix-app/src/test/resources/runtimets/results/string/string-equal4/string-equal4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-join1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-join1/string-join1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/string-join1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/string-join1/string-join1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint.adm b/asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint/string-to-codepoint.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint.adm
rename to asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint/string-to-codepoint.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint1.adm b/asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint1/string-to-codepoint1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/string-to-codepoint1/string-to-codepoint1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strlen02.adm b/asterix-app/src/test/resources/runtimets/results/string/strlen02/strlen02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strlen02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strlen02/strlen02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strlen03.adm b/asterix-app/src/test/resources/runtimets/results/string/strlen03/strlen03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strlen03.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strlen03/strlen03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strtocpt01.adm b/asterix-app/src/test/resources/runtimets/results/string/strtocpt01/strtocpt01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strtocpt01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strtocpt01/strtocpt01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strtocpt02.adm b/asterix-app/src/test/resources/runtimets/results/string/strtocpt02/strtocpt02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strtocpt02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strtocpt02/strtocpt02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/strtocpt03.adm b/asterix-app/src/test/resources/runtimets/results/string/strtocpt03/strtocpt03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/strtocpt03.adm
rename to asterix-app/src/test/resources/runtimets/results/string/strtocpt03/strtocpt03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substr01.adm b/asterix-app/src/test/resources/runtimets/results/string/substr01/substr01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substr01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substr01/substr01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substr04.adm b/asterix-app/src/test/resources/runtimets/results/string/substr04/substr04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substr04.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substr04/substr04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substr05.adm b/asterix-app/src/test/resources/runtimets/results/string/substr05/substr05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substr05.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substr05/substr05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substr06.adm b/asterix-app/src/test/resources/runtimets/results/string/substr06.adm
deleted file mode 100644
index 52a2718..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/substr06.adm
+++ /dev/null
@@ -1,8 +0,0 @@
-"Berkeley"
-"Irvine"
-"LA"
-"Riverside"
-"San Diego"
-"Santa Barbara"
-"Austin "
-"Dallas"
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substr05.adm b/asterix-app/src/test/resources/runtimets/results/string/substr06/substr06.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/substr05.adm
copy to asterix-app/src/test/resources/runtimets/results/string/substr06/substr06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-after-1.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-after-1/substring-after-1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring-after-1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring-after-1/substring-after-1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-after-2.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-after-2/substring-after-2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring-after-2.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring-after-2/substring-after-2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-after-3.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-after-3.adm
deleted file mode 100644
index 04393a4..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/substring-after-3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": "" }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-after-2.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-after-3/substring-after-3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/substring-after-2.adm
copy to asterix-app/src/test/resources/runtimets/results/string/substring-after-3/substring-after-3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-after-4.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-after-4/substring-after-4.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring-after-4.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring-after-4/substring-after-4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-before-1.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-before-1/substring-before-1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring-before-1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring-before-1/substring-before-1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-before-2.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-before-2.adm
deleted file mode 100644
index 04393a4..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/substring-before-2.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": "" }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-after-2.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-before-2/substring-before-2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/substring-after-2.adm
copy to asterix-app/src/test/resources/runtimets/results/string/substring-before-2/substring-before-2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring-before-3.adm b/asterix-app/src/test/resources/runtimets/results/string/substring-before-3/substring-before-3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring-before-3.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring-before-3/substring-before-3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring2-1.adm b/asterix-app/src/test/resources/runtimets/results/string/substring2-1/substring2-1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring2-1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring2-1/substring2-1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring2-2.adm b/asterix-app/src/test/resources/runtimets/results/string/substring2-2/substring2-2.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring2-2.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring2-2/substring2-2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring2-3.adm b/asterix-app/src/test/resources/runtimets/results/string/substring2-3/substring2-3.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring2-3.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring2-3/substring2-3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring2-4.adm b/asterix-app/src/test/resources/runtimets/results/string/substring2-4.adm
deleted file mode 100644
index 5b0c7b9..0000000
--- a/asterix-app/src/test/resources/runtimets/results/string/substring2-4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "result1": "HEllow" }
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring2-2.adm b/asterix-app/src/test/resources/runtimets/results/string/substring2-4/substring2-4.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/substring2-2.adm
copy to asterix-app/src/test/resources/runtimets/results/string/substring2-4/substring2-4.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/substring_01.adm b/asterix-app/src/test/resources/runtimets/results/string/substring_01/substring_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/substring_01.adm
rename to asterix-app/src/test/resources/runtimets/results/string/substring_01/substring_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches02.adm b/asterix-app/src/test/resources/runtimets/results/string/tches02/tches02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches02/tches02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches03.adm b/asterix-app/src/test/resources/runtimets/results/string/tches03/tches03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches03.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches03/tches03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches04.adm b/asterix-app/src/test/resources/runtimets/results/string/tches04/tches04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches04.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches04/tches04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches05.adm b/asterix-app/src/test/resources/runtimets/results/string/tches05/tches05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches05.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches05/tches05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches06.adm b/asterix-app/src/test/resources/runtimets/results/string/tches06/tches06.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches06.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches06/tches06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/tches1/tches1.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches1/tches1.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches11.adm b/asterix-app/src/test/resources/runtimets/results/string/tches11/tches11.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matches11.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches11/tches11.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/tches2/tches2.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/tches2/tches2.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/tches21/tches21.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tches21/tches21.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/tches22/tches22.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/tches22/tches22.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matches1.adm b/asterix-app/src/test/resources/runtimets/results/string/tches23/tches23.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/matches1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/tches23/tches23.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/end-with1.adm b/asterix-app/src/test/resources/runtimets/results/string/tches3/tches3.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/string/end-with1.adm
copy to asterix-app/src/test/resources/runtimets/results/string/tches3/tches3.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/matchesnull.adm b/asterix-app/src/test/resources/runtimets/results/string/tchesnull/tchesnull.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/matchesnull.adm
rename to asterix-app/src/test/resources/runtimets/results/string/tchesnull/tchesnull.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/toLowerCase02.adm b/asterix-app/src/test/resources/runtimets/results/string/toLowerCase02/toLowerCase02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/toLowerCase02.adm
rename to asterix-app/src/test/resources/runtimets/results/string/toLowerCase02/toLowerCase02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/toLowerCase03.adm b/asterix-app/src/test/resources/runtimets/results/string/toLowerCase03/toLowerCase03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/toLowerCase03.adm
rename to asterix-app/src/test/resources/runtimets/results/string/toLowerCase03/toLowerCase03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/string/toLowerCase04.adm b/asterix-app/src/test/resources/runtimets/results/string/toLowerCase04/toLowerCase04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/string/toLowerCase04.adm
rename to asterix-app/src/test/resources/runtimets/results/string/toLowerCase04/toLowerCase04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/01.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/01/01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/subset-collection/01.adm
rename to asterix-app/src/test/resources/runtimets/results/subset-collection/01/01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/02.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/02/02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/subset-collection/02.adm
rename to asterix-app/src/test/resources/runtimets/results/subset-collection/02/02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/03.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/03/03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/subset-collection/03.adm
rename to asterix-app/src/test/resources/runtimets/results/subset-collection/03/03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/05.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/05/05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/subset-collection/05.adm
rename to asterix-app/src/test/resources/runtimets/results/subset-collection/05/05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/06.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/06/06.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/subset-collection/06.adm
rename to asterix-app/src/test/resources/runtimets/results/subset-collection/06/06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/07.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/07.adm
deleted file mode 100644
index b944734..0000000
--- a/asterix-app/src/test/resources/runtimets/results/subset-collection/07.adm
+++ /dev/null
@@ -1,2 +0,0 @@
-3
-4
diff --git a/asterix-app/src/test/resources/runtimets/results/subset-collection/06.adm b/asterix-app/src/test/resources/runtimets/results/subset-collection/07/07.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/subset-collection/06.adm
copy to asterix-app/src/test/resources/runtimets/results/subset-collection/07/07.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/calendar_duration.adm b/asterix-app/src/test/resources/runtimets/results/temp/calendar_duration/calendar_duration.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/calendar_duration.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/calendar_duration/calendar_duration.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/accessors.adm b/asterix-app/src/test/resources/runtimets/results/temp/ccessors/ccessors.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/accessors.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/ccessors/ccessors.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/insert_from_delimited_ds.adm b/asterix-app/src/test/resources/runtimets/results/temp/insert_from_delimited_ds/insert_from_delimited_ds.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/insert_from_delimited_ds.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/insert_from_delimited_ds/insert_from_delimited_ds.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds.adm b/asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds/insert_from_ext_ds.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds/insert_from_ext_ds.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/interval_functions.adm b/asterix-app/src/test/resources/runtimets/results/temp/interval_functions/interval_functions.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/interval_functions.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/interval_functions/interval_functions.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/adjust_timezone.adm b/asterix-app/src/test/resources/runtimets/results/temp/just_timezone/just_timezone.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/adjust_timezone.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/just_timezone/just_timezone.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/date_functions.adm b/asterix-app/src/test/resources/runtimets/results/temp/te_functions/te_functions.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/date_functions.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/te_functions/te_functions.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/datetime_functions.adm b/asterix-app/src/test/resources/runtimets/results/temp/tetime_functions/tetime_functions.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/datetime_functions.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/tetime_functions/tetime_functions.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/time_functions.adm b/asterix-app/src/test/resources/runtimets/results/temp/time_functions/time_functions.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/temp/time_functions.adm
rename to asterix-app/src/test/resources/runtimets/results/temp/time_functions/time_functions.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_01.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_01.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_02.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_02.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-word-tokens_01.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-word-tokens_01.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_01.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_01/gram-tokens_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_01.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_01/gram-tokens_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_02.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_02/gram-tokens_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_02.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/gram-tokens_02/gram-tokens_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_01.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_01.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_02.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_02.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-word-tokens_01.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-word-tokens_01.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_01.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_01/word-tokens_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_01.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_01/word-tokens_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_02.adm b/asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_02/word-tokens_02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_02.adm
rename to asterix-app/src/test/resources/runtimets/results/tokenizers/word-tokens_02/word-tokens_02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/group_no_agg.adm b/asterix-app/src/test/resources/runtimets/results/tpch/group_no_agg/group_no_agg.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/group_no_agg.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/group_no_agg/group_no_agg.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/distinct_by.adm b/asterix-app/src/test/resources/runtimets/results/tpch/istinct_by/istinct_by.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/distinct_by.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/istinct_by/istinct_by.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_item.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_ite/q10_returned_ite.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_item.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_ite/q10_returned_ite.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_item_int64.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_item_int64/q10_returned_item_int64.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_item_int64.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q10_returned_item_int64/q10_returned_item_int64.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q11_important_stock.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q11_important_stock/q11_important_stock.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q11_important_stock.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q11_important_stock/q11_important_stock.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q12_shipping.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q12_shipping/q12_shipping.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q12_shipping.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q12_shipping/q12_shipping.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q13_customer_distribution.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q13_customer_distribution/q13_customer_distribution.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q13_customer_distribution.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q13_customer_distribution/q13_customer_distribution.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q14_promotion_effect.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q14_promotion_effect/q14_promotion_effect.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q14_promotion_effect.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q14_promotion_effect/q14_promotion_effect.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q15_top_supplier.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q15_top_supplier/q15_top_supplier.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q15_top_supplier.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q15_top_supplier/q15_top_supplier.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q16_parts_supplier_relationship.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q16_parts_supplier_relationship.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q17_small_quantity_order_revenue.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q17_small_quantity_order_revenue.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q18_large_volume_customer.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q18_large_volume_customer/q18_large_volume_customer.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q18_large_volume_customer.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q18_large_volume_customer/q18_large_volume_customer.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q19_discounted_revenue.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q19_discounted_revenue/q19_discounted_revenue.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q19_discounted_revenue.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q19_discounted_revenue/q19_discounted_revenue.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q1_pricing_summary_report_nt.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q1_pricing_summary_report_nt/q1_pricing_summary_report_nt.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q1_pricing_summary_report_nt.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q1_pricing_summary_report_nt/q1_pricing_summary_report_nt.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q20_potential_part_promotion.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q20_potential_part_promotion/q20_potential_part_promotion.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q20_potential_part_promotion.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q20_potential_part_promotion/q20_potential_part_promotion.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q21_suppliers_who_kept_orders_waiting.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q21_suppliers_who_kept_orders_waiting.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q22_global_sales_opportunity.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q22_global_sales_opportunity.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q2_minimum_cost_supplier.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q2_minimum_cost_supplier/q2_minimum_cost_supplier.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q2_minimum_cost_supplier.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q2_minimum_cost_supplier/q2_minimum_cost_supplier.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q3_shipping_priority_nt.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q3_shipping_priority_nt/q3_shipping_priority_nt.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q3_shipping_priority_nt.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q3_shipping_priority_nt/q3_shipping_priority_nt.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q4_order_priority.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q4_order_priority/q4_order_priority.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q4_order_priority.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q4_order_priority/q4_order_priority.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q5_local_supplier_volume.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q5_local_supplier_volume/q5_local_supplier_volume.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q5_local_supplier_volume.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q5_local_supplier_volume/q5_local_supplier_volume.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q6_forecast_revenue_change.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q6_forecast_revenue_change.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q7_volume_shipping.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q7_volume_shipping/q7_volume_shipping.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q7_volume_shipping.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q7_volume_shipping/q7_volume_shipping.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q8_national_market_share.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q8_national_market_share/q8_national_market_share.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q8_national_market_share.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q8_national_market_share/q8_national_market_share.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/q9_product_type_profit_nt.adm b/asterix-app/src/test/resources/runtimets/results/tpch/q9_product_type_profit_nt/q9_product_type_profit_nt.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/tpch/q9_product_type_profit_nt.adm
rename to asterix-app/src/test/resources/runtimets/results/tpch/q9_product_type_profit_nt/q9_product_type_profit_nt.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/query-issue201.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/query-issue201/query-issue201.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/query-issue201.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/query-issue201/query-issue201.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf01.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf01/udf01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf01.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf01/udf01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf02.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf02/udf02.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf02.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf02/udf02.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf03.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf03/udf03.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf03.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf03/udf03.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf04.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf04/udf04.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf04.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf04/udf04.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf05.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf05/udf05.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf05.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf05/udf05.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf06.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf06.adm
deleted file mode 100644
index 5885d0f..0000000
--- a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf06.adm
+++ /dev/null
@@ -1 +0,0 @@
-1234.1d
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf03.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf06/udf06.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf03.adm
copy to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf06/udf06.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf07.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf07/udf07.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf07.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf07/udf07.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf08.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf08/udf08.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf08.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf08/udf08.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf09.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf09/udf09.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf09.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf09/udf09.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf10.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf10/udf10.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf10.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf10/udf10.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf11.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf11.adm
deleted file mode 100644
index f00c965..0000000
--- a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf11.adm
+++ /dev/null
@@ -1,10 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf01.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf11/udf11.1.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf01.adm
copy to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf11/udf11.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12/udf12.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12/udf12.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf13.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf13/udf13.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf13.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf13/udf13.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf14.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf14/udf14.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf14.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf14/udf14.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf16.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf16/udf16.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf16.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf16/udf16.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf17.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf17/udf17.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf17.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf17/udf17.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf18.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf18/udf18.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf18.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf18/udf18.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf19.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf19/udf19.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf19.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf19/udf19.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf20.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf20/udf20.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf20.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf20/udf20.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf21.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf21/udf21.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf21.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf21/udf21.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf22.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf22/udf22.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf22.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf22/udf22.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23/udf23.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23/udf23.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf27.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf27/udf27.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf27.adm
rename to asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf27/udf27.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/writers/print_01.adm b/asterix-app/src/test/resources/runtimets/results/writers/print_01/print_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/writers/print_01.adm
rename to asterix-app/src/test/resources/runtimets/results/writers/print_01/print_01.1.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/writers/serialized_01.adm b/asterix-app/src/test/resources/runtimets/results/writers/serialized_01/serialized_01.1.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/writers/serialized_01.adm
rename to asterix-app/src/test/resources/runtimets/results/writers/serialized_01/serialized_01.1.adm
Binary files differ