merged asterix_stabilization -r1373:1393 --> asterix_lsm_stabilization

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1395 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterix-app/src/test/resources/runtimets/testsuite.xml
index 809c40b..f1f2a26 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -2,587 +2,592 @@
   <test-group name="aggregate">
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_double">
-        <output-file compare="Text">avg_double.adm</output-file>
+        <output-dir compare="Text">avg_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_double_null">
-        <output-file compare="Text">avg_double_null.adm</output-file>
+        <output-dir compare="Text">avg_double_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_empty_01">
-        <output-file compare="Text">avg_empty_01.adm</output-file>
+        <output-dir compare="Text">avg_empty_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_empty_02">
-        <output-file compare="Text">avg_empty_02.adm</output-file>
+        <output-dir compare="Text">avg_empty_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_float">
-        <output-file compare="Text">avg_float.adm</output-file>
+        <output-dir compare="Text">avg_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_float_null">
-        <output-file compare="Text">avg_float_null.adm</output-file>
+        <output-dir compare="Text">avg_float_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int16">
-        <output-file compare="Text">avg_int16.adm</output-file>
+        <output-dir compare="Text">avg_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int16_null">
-        <output-file compare="Text">avg_int16_null.adm</output-file>
+        <output-dir compare="Text">avg_int16_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int32">
-        <output-file compare="Text">avg_int32.adm</output-file>
+        <output-dir compare="Text">avg_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int32_null">
-        <output-file compare="Text">avg_int32_null.adm</output-file>
+        <output-dir compare="Text">avg_int32_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int64">
-        <output-file compare="Text">avg_int64.adm</output-file>
+        <output-dir compare="Text">avg_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int64_null">
-        <output-file compare="Text">avg_int64_null.adm</output-file>
+        <output-dir compare="Text">avg_int64_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int8">
-        <output-file compare="Text">avg_int8.adm</output-file>
+        <output-dir compare="Text">avg_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="avg_int8_null">
-        <output-file compare="Text">avg_int8_null.adm</output-file>
+        <output-dir compare="Text">avg_int8_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="count_01">
-        <output-file compare="Text">count_01.adm</output-file>
+        <output-dir compare="Text">count_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="count_empty_01">
-        <output-file compare="Text">count_empty_01.adm</output-file>
+        <output-dir compare="Text">count_empty_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="count_empty_02">
-        <output-file compare="Text">count_empty_02.adm</output-file>
+        <output-dir compare="Text">count_empty_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="count_null">
-        <output-file compare="Text">count_null.adm</output-file>
+        <output-dir compare="Text">count_null</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="aggregate">
       <compilation-unit name="droptype">
-        <output-file compare="Text">droptype.adm</output-file>
+        <output-dir compare="Text">droptype</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="aggregate">
       <compilation-unit name="global-avg_01">
-        <output-file compare="Text">global-avg_01.adm</output-file>
+        <output-dir compare="Text">global-avg_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="global-avg_null">
-        <output-file compare="Text">global-avg_null.adm</output-file>
+        <output-dir compare="Text">global-avg_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_double">
-        <output-file compare="Text">local-avg_double.adm</output-file>
+        <output-dir compare="Text">local-avg_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_double_null">
-        <output-file compare="Text">local-avg_double_null.adm</output-file>
+        <output-dir compare="Text">local-avg_double_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_float">
-        <output-file compare="Text">local-avg_float.adm</output-file>
+        <output-dir compare="Text">local-avg_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_float_null">
-        <output-file compare="Text">local-avg_float_null.adm</output-file>
+        <output-dir compare="Text">local-avg_float_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int16">
-        <output-file compare="Text">local-avg_int16.adm</output-file>
+        <output-dir compare="Text">local-avg_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int16_null">
-        <output-file compare="Text">local-avg_int16_null.adm</output-file>
+        <output-dir compare="Text">local-avg_int16_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int32">
-        <output-file compare="Text">local-avg_int32.adm</output-file>
+        <output-dir compare="Text">local-avg_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int32_null">
-        <output-file compare="Text">local-avg_int32_null.adm</output-file>
+        <output-dir compare="Text">local-avg_int32_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int64">
-        <output-file compare="Text">local-avg_int64.adm</output-file>
+        <output-dir compare="Text">local-avg_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int64_null">
-        <output-file compare="Text">local-avg_int64_null.adm</output-file>
+        <output-dir compare="Text">local-avg_int64_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int8">
-        <output-file compare="Text">local-avg_int8.adm</output-file>
+        <output-dir compare="Text">local-avg_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="local-avg_int8_null">
-        <output-file compare="Text">local-avg_int8_null.adm</output-file>
+        <output-dir compare="Text">local-avg_int8_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="max_empty_01">
-        <output-file compare="Text">max_empty_01.adm</output-file>
+        <output-dir compare="Text">max_empty_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="max_empty_02">
-        <output-file compare="Text">max_empty_02.adm</output-file>
+        <output-dir compare="Text">max_empty_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="min_empty_01">
-        <output-file compare="Text">min_empty_01.adm</output-file>
+        <output-dir compare="Text">min_empty_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="min_empty_02">
-        <output-file compare="Text">min_empty_02.adm</output-file>
+        <output-dir compare="Text">min_empty_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_avg">
-        <output-file compare="Text">scalar_avg.adm</output-file>
+        <output-dir compare="Text">scalar_avg</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_avg_empty">
-        <output-file compare="Text">scalar_avg_empty.adm</output-file>
+        <output-dir compare="Text">scalar_avg_empty</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_avg_null">
-        <output-file compare="Text">scalar_avg_null.adm</output-file>
+        <output-dir compare="Text">scalar_avg_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_count">
-        <output-file compare="Text">scalar_count.adm</output-file>
+        <output-dir compare="Text">scalar_count</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_count_empty">
-        <output-file compare="Text">scalar_count_empty.adm</output-file>
+        <output-dir compare="Text">scalar_count_empty</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_count_null">
-        <output-file compare="Text">scalar_count_null.adm</output-file>
+        <output-dir compare="Text">scalar_count_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_max">
-        <output-file compare="Text">scalar_max.adm</output-file>
+        <output-dir compare="Text">scalar_max</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_max_empty">
-        <output-file compare="Text">scalar_max_empty.adm</output-file>
+        <output-dir compare="Text">scalar_max_empty</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_max_null">
-        <output-file compare="Text">scalar_max_null.adm</output-file>
+        <output-dir compare="Text">scalar_max_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_min">
-        <output-file compare="Text">scalar_min.adm</output-file>
+        <output-dir compare="Text">scalar_min</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_min_empty">
-        <output-file compare="Text">scalar_min_empty.adm</output-file>
+        <output-dir compare="Text">scalar_min_empty</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_min_null">
-        <output-file compare="Text">scalar_min_null.adm</output-file>
+        <output-dir compare="Text">scalar_min_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_sum">
-        <output-file compare="Text">scalar_sum.adm</output-file>
+        <output-dir compare="Text">scalar_sum</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_sum_empty">
-        <output-file compare="Text">scalar_sum_empty.adm</output-file>
+        <output-dir compare="Text">scalar_sum_empty</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="scalar_sum_null">
-        <output-file compare="Text">scalar_sum_null.adm</output-file>
+        <output-dir compare="Text">scalar_sum_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_double">
-        <output-file compare="Text">sum_double.adm</output-file>
+        <output-dir compare="Text">sum_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_double_null">
-        <output-file compare="Text">sum_double_null.adm</output-file>
+        <output-dir compare="Text">sum_double_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_empty_01">
-        <output-file compare="Text">sum_empty_01.adm</output-file>
+        <output-dir compare="Text">sum_empty_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_empty_02">
-        <output-file compare="Text">sum_empty_02.adm</output-file>
+        <output-dir compare="Text">sum_empty_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_float">
-        <output-file compare="Text">sum_float.adm</output-file>
+        <output-dir compare="Text">sum_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_float_null">
-        <output-file compare="Text">sum_float_null.adm</output-file>
+        <output-dir compare="Text">sum_float_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int16">
-        <output-file compare="Text">sum_int16.adm</output-file>
+        <output-dir compare="Text">sum_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int16_null">
-        <output-file compare="Text">sum_int16_null.adm</output-file>
+        <output-dir compare="Text">sum_int16_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int32">
-        <output-file compare="Text">sum_int32.adm</output-file>
+        <output-dir compare="Text">sum_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int32_null">
-        <output-file compare="Text">sum_int32_null.adm</output-file>
+        <output-dir compare="Text">sum_int32_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int64">
-        <output-file compare="Text">sum_int64.adm</output-file>
+        <output-dir compare="Text">sum_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int64_null">
-        <output-file compare="Text">sum_int64_null.adm</output-file>
+        <output-dir compare="Text">sum_int64_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int8">
-        <output-file compare="Text">sum_int8.adm</output-file>
+        <output-dir compare="Text">sum_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_int8_null">
-        <output-file compare="Text">sum_int8_null.adm</output-file>
+        <output-dir compare="Text">sum_int8_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_null-with-pred">
-        <output-file compare="Text">sum_null-with-pred.adm</output-file>
+        <output-dir compare="Text">sum_null-with-pred</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
       <compilation-unit name="sum_numeric_null">
-        <output-file compare="Text">sum_numeric_null.adm</output-file>
+        <output-dir compare="Text">sum_numeric_null</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="boolean">
     <test-case FilePath="boolean">
       <compilation-unit name="and_01">
-        <output-file compare="Text">and_01.adm</output-file>
+        <output-dir compare="Text">and_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="boolean">
       <compilation-unit name="and_null">
-        <output-file compare="Text">and_null.adm</output-file>
+        <output-dir compare="Text">and_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="boolean">
       <compilation-unit name="and_null_false">
-        <output-file compare="Text">and_null_false.adm</output-file>
+        <output-dir compare="Text">and_null_false</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="boolean">
       <compilation-unit name="not_01">
-        <output-file compare="Text">not_01.adm</output-file>
+        <output-dir compare="Text">not_01</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="comparison">
     <test-case FilePath="comparison">
       <compilation-unit name="datetime_order">
-        <output-file compare="Text">datetime_order.adm</output-file>
+        <output-dir compare="Text">datetime_order</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="datetime_range">
-        <output-file compare="Text">datetime_range.adm</output-file>
+        <output-dir compare="Text">datetime_range</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="datetime_tzeq">
-        <output-file compare="Text">datetime_tzeq.adm</output-file>
+        <output-dir compare="Text">datetime_tzeq</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="double">
-        <output-file compare="Text">double.adm</output-file>
+        <output-dir compare="Text">double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="double_gte_01">
-        <output-file compare="Text">double_gte_01.adm</output-file>
+        <output-dir compare="Text">double_gte_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="double_null">
-        <output-file compare="Text">double_null.adm</output-file>
+        <output-dir compare="Text">double_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="eq_01">
-        <output-file compare="Text">eq_01.adm</output-file>
+        <output-dir compare="Text">eq_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="float">
-        <output-file compare="Text">float.adm</output-file>
+        <output-dir compare="Text">float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="float_null">
-        <output-file compare="Text">float_null.adm</output-file>
+        <output-dir compare="Text">float_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="gt_01">
-        <output-file compare="Text">gt_01.adm</output-file>
+        <output-dir compare="Text">gt_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="gte_01">
-        <output-file compare="Text">gte_01.adm</output-file>
+        <output-dir compare="Text">gte_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int16">
-        <output-file compare="Text">int16.adm</output-file>
+        <output-dir compare="Text">int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int16_null">
-        <output-file compare="Text">int16_null.adm</output-file>
+        <output-dir compare="Text">int16_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int32">
-        <output-file compare="Text">int32.adm</output-file>
+        <output-dir compare="Text">int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int32_null">
-        <output-file compare="Text">int32_null.adm</output-file>
+        <output-dir compare="Text">int32_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int64">
-        <output-file compare="Text">int64.adm</output-file>
+        <output-dir compare="Text">int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int64_null">
-        <output-file compare="Text">int64_null.adm</output-file>
+        <output-dir compare="Text">int64_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int8">
-        <output-file compare="Text">int8.adm</output-file>
+        <output-dir compare="Text">int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="int8_null">
-        <output-file compare="Text">int8_null.adm</output-file>
+        <output-dir compare="Text">int8_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="lt_01">
-        <output-file compare="Text">lt_01.adm</output-file>
+        <output-dir compare="Text">lt_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="lte_01">
-        <output-file compare="Text">lte_01.adm</output-file>
+        <output-dir compare="Text">lte_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="neq_01">
-        <output-file compare="Text">neq_01.adm</output-file>
+        <output-dir compare="Text">neq_01</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="comparison">
       <compilation-unit name="numeric-comparison_01">
-        <output-file compare="Text">numeric-comparison_01.adm</output-file>
+        <output-dir compare="Text">numeric-comparison_01</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="comparison">
       <compilation-unit name="string">
-        <output-file compare="Text">string.adm</output-file>
+        <output-dir compare="Text">string</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="comparison">
       <compilation-unit name="string_null">
-        <output-file compare="Text">string_null.adm</output-file>
+        <output-dir compare="Text">string_null</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="constructor">
     <test-case FilePath="constructor">
       <compilation-unit name="add-null">
-        <output-file compare="Text">add-null.adm</output-file>
+        <output-dir compare="Text">add-null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="boolean_01">
-        <output-file compare="Text">boolean_01.adm</output-file>
+        <output-dir compare="Text">boolean_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="circle_01">
-        <output-file compare="Text">circle_01.adm</output-file>
+        <output-dir compare="Text">circle_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="date_01">
-        <output-file compare="Text">date_01.adm</output-file>
+        <output-dir compare="Text">date_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="datetime_01">
-        <output-file compare="Text">datetime_01.adm</output-file>
+        <output-dir compare="Text">datetime_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="double_01">
-        <output-file compare="Text">double_01.adm</output-file>
+        <output-dir compare="Text">double_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="duration_01">
-        <output-file compare="Text">duration_01.adm</output-file>
+        <output-dir compare="Text">duration_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="float_01">
-        <output-file compare="Text">float_01.adm</output-file>
+        <output-dir compare="Text">float_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="int_01">
-        <output-file compare="Text">int_01.adm</output-file>
+        <output-dir compare="Text">int_01</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="constructor">
+      <compilation-unit name="interval">
+        <output-dir compare="Text">interval</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="line_01">
-        <output-file compare="Text">line_01.adm</output-file>
+        <output-dir compare="Text">line_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="point_01">
-        <output-file compare="Text">point_01.adm</output-file>
+        <output-dir compare="Text">point_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="polygon_01">
-        <output-file compare="Text">polygon_01.adm</output-file>
+        <output-dir compare="Text">polygon_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="primitive-01">
-        <output-file compare="Text">primitive-01.adm</output-file>
+        <output-dir compare="Text">primitive-01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="primitive-02">
-        <output-file compare="Text">primitive-02.adm</output-file>
+        <output-dir compare="Text">primitive-02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="primitive-03">
-        <output-file compare="Text">primitive-03.adm</output-file>
+        <output-dir compare="Text">primitive-03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="primitive-04">
-        <output-file compare="Text">primitive-04.adm</output-file>
+        <output-dir compare="Text">primitive-04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="string_01">
-        <output-file compare="Text">string_01.adm</output-file>
+        <output-dir compare="Text">string_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="constructor">
       <compilation-unit name="time_01">
-        <output-file compare="Text">time_01.adm</output-file>
+        <output-dir compare="Text">time_01</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
@@ -590,149 +595,149 @@
     <!--
     <test-case FilePath="custord">
       <compilation-unit name="co">
-        <output-file compare="Text">co.adm</output-file>
+        <output-dir compare="Text">co</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_01">
-        <output-file compare="Text">customer_q_01.adm</output-file>
+        <output-dir compare="Text">customer_q_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_02">
-        <output-file compare="Text">customer_q_02.adm</output-file>
+        <output-dir compare="Text">customer_q_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_03">
-        <output-file compare="Text">customer_q_03.adm</output-file>
+        <output-dir compare="Text">customer_q_03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_04">
-        <output-file compare="Text">customer_q_04.adm</output-file>
+        <output-dir compare="Text">customer_q_04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_05">
-        <output-file compare="Text">customer_q_05.adm</output-file>
+        <output-dir compare="Text">customer_q_05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_06">
-        <output-file compare="Text">customer_q_06.adm</output-file>
+        <output-dir compare="Text">customer_q_06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_07">
-        <output-file compare="Text">customer_q_07.adm</output-file>
+        <output-dir compare="Text">customer_q_07</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_08">
-        <output-file compare="Text">customer_q_08.adm</output-file>
+        <output-dir compare="Text">customer_q_08</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="custord">
       <compilation-unit name="denorm-cust-order_01">
-        <output-file compare="Text">denorm-cust-order_01.adm</output-file>
+        <output-dir compare="Text">denorm-cust-order_01</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="custord">
       <compilation-unit name="denorm-cust-order_02">
-        <output-file compare="Text">denorm-cust-order_02.adm</output-file>
+        <output-dir compare="Text">denorm-cust-order_02</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="custord">
       <compilation-unit name="denorm-cust-order_03">
-        <output-file compare="Text">denorm-cust-order_03.adm</output-file>
+        <output-dir compare="Text">denorm-cust-order_03</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="custord">
       <compilation-unit name="freq-clerk">
-        <output-file compare="Text">freq-clerk.adm</output-file>
+        <output-dir compare="Text">freq-clerk</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="custord">
       <compilation-unit name="join_q_01">
-        <output-file compare="Text">join_q_01.adm</output-file>
+        <output-dir compare="Text">join_q_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="join_q_02">
-        <output-file compare="Text">join_q_02.adm</output-file>
+        <output-dir compare="Text">join_q_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="join_q_03">
-        <output-file compare="Text">join_q_03.adm</output-file>
+        <output-dir compare="Text">join_q_03</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="custord">
       <compilation-unit name="join_q_04">
-        <output-file compare="Text">join_q_04.adm</output-file>
+        <output-dir compare="Text">join_q_04</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="custord">
       <compilation-unit name="load-test">
-        <output-file compare="Text">load-test.adm</output-file>
+        <output-dir compare="Text">load-test</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="order_q_01">
-        <output-file compare="Text">order_q_01.adm</output-file>
+        <output-dir compare="Text">order_q_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="order_q_02">
-        <output-file compare="Text">order_q_02.adm</output-file>
+        <output-dir compare="Text">order_q_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="order_q_03">
-        <output-file compare="Text">order_q_03.adm</output-file>
+        <output-dir compare="Text">order_q_03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="order_q_04">
-        <output-file compare="Text">order_q_04.adm</output-file>
+        <output-dir compare="Text">order_q_04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="order_q_05">
-        <output-file compare="Text">order_q_05.adm</output-file>
+        <output-dir compare="Text">order_q_05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="custord">
       <compilation-unit name="order_q_06">
-        <output-file compare="Text">order_q_06.adm</output-file>
+        <output-dir compare="Text">order_q_06</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="dapd">
     <test-case FilePath="dapd">
       <compilation-unit name="q1">
-        <output-file compare="Text">q1.adm</output-file>
+        <output-dir compare="Text">q1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dapd">
       <compilation-unit name="q2">
-        <output-file compare="Text">q2.adm</output-file>
+        <output-dir compare="Text">q2</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="dapd">
       <compilation-unit name="q3">
-        <output-file compare="Text">q3.adm</output-file>
+        <output-dir compare="Text">q3</output-dir>
       </compilation-unit>
     </test-case>
     -->
@@ -740,240 +745,240 @@
   <test-group name="dml">
     <test-case FilePath="dml">
       <compilation-unit name="query-issue205">
-        <output-file compare="Text">query-issue205.adm</output-file>
+        <output-dir compare="Text">query-issue205</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="delete-from-loaded-dataset-with-index">
-        <output-file compare="Text">delete-from-loaded-dataset-with-index.adm</output-file>
+        <output-dir compare="Text">delete-from-loaded-dataset-with-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="delete-from-loaded-dataset">
-        <output-file compare="Text">delete-from-loaded-dataset.adm</output-file>
+        <output-dir compare="Text">delete-from-loaded-dataset</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="delete-syntax-change">
-        <output-file compare="Text">delete-syntax-change.adm</output-file>
+        <output-dir compare="Text">delete-syntax-change</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="drop-empty-secondary-indexes">
-        <output-file compare="Text">drop-empty-secondary-indexes.adm</output-file>
+        <output-dir compare="Text">drop-empty-secondary-indexes</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="create-drop-cltype">
-        <output-file compare="Text">create-drop-cltype.adm</output-file>
+        <output-dir compare="Text">create-drop-cltype</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="create-drop-opntype">
-        <output-file compare="Text">create-drop-opntype.adm</output-file>
+        <output-dir compare="Text">create-drop-opntype</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="empty-load-with-index">
-        <output-file compare="Text">empty-load-with-index.adm</output-file>
+        <output-dir compare="Text">empty-load-with-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="empty-load">
-        <output-file compare="Text">empty-load.adm</output-file>
+        <output-dir compare="Text">empty-load</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-into-empty-dataset-with-index">
-        <output-file compare="Text">insert-into-empty-dataset-with-index.adm</output-file>
+        <output-dir compare="Text">insert-into-empty-dataset-with-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-into-empty-dataset-with-index">
-        <output-file compare="Text">insert-into-empty-dataset-with-index.adm</output-file>
+        <output-dir compare="Text">insert-into-empty-dataset-with-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-syntax">
-        <output-file compare="Text">insert-syntax.adm</output-file>
+        <output-dir compare="Text">insert-syntax</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-into-loaded-dataset-with-index_01">
-        <output-file compare="Text">insert-into-loaded-dataset-with-index_01.adm</output-file>
+        <output-dir compare="Text">insert-into-loaded-dataset-with-index_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-into-loaded-dataset-with-index_02">
-        <output-file compare="Text">insert-into-loaded-dataset-with-index_02.adm</output-file>
+        <output-dir compare="Text">insert-into-loaded-dataset-with-index_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-into-loaded-dataset_01">
-        <output-file compare="Text">insert-into-loaded-dataset_01.adm</output-file>
+        <output-dir compare="Text">insert-into-loaded-dataset_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-into-loaded-dataset_02">
-        <output-file compare="Text">insert-into-loaded-dataset_02.adm</output-file>
+        <output-dir compare="Text">insert-into-loaded-dataset_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert-src-dst-01">
-        <output-file compare="Text">insert-src-dst-01.adm</output-file>
+        <output-dir compare="Text">insert-src-dst-01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert">
-        <output-file compare="Text">insert.adm</output-file>
+        <output-dir compare="Text">insert</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="insert_less_nc">
-        <output-file compare="Text">insert_less_nc.adm</output-file>
+        <output-dir compare="Text">insert_less_nc</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="dml">
       <compilation-unit name="load-from-hdfs">
-        <output-file compare="Text">load-from-hdfs.adm</output-file>
+        <output-dir compare="Text">load-from-hdfs</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="dml">
       <compilation-unit name="load-with-index">
-        <output-file compare="Text">load-with-index.adm</output-file>
+        <output-dir compare="Text">load-with-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-c2o-recursive">
-        <output-file compare="Text">opentype-c2o-recursive.adm</output-file>
+        <output-dir compare="Text">opentype-c2o-recursive</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-c2o">
-        <output-file compare="Text">opentype-c2o.adm</output-file>
+        <output-dir compare="Text">opentype-c2o</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-closed-optional">
-        <output-file compare="Text">opentype-closed-optional.adm</output-file>
+        <output-dir compare="Text">opentype-closed-optional</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-insert">
-        <output-file compare="Text">opentype-insert.adm</output-file>
+        <output-dir compare="Text">opentype-insert</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-insert2">
-        <output-file compare="Text">opentype-insert2.adm</output-file>
+        <output-dir compare="Text">opentype-insert2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-noexpand">
-        <output-file compare="Text">opentype-noexpand.adm</output-file>
+        <output-dir compare="Text">opentype-noexpand</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-o2c-recursive">
-        <output-file compare="Text">opentype-o2c-recursive.adm</output-file>
+        <output-dir compare="Text">opentype-o2c-recursive</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-o2c">
-        <output-file compare="Text">opentype-o2c.adm</output-file>
+        <output-dir compare="Text">opentype-o2c</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="opentype-o2o">
-        <output-file compare="Text">opentype-o2o.adm</output-file>
+        <output-dir compare="Text">opentype-o2o</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="scan-delete-btree-secondary-index-nullable">
-        <output-file compare="Text">scan-delete-btree-secondary-index-nullable.adm</output-file>
+        <output-dir compare="Text">scan-delete-btree-secondary-index-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="scan-delete-rtree-secondary-index-nullable">
-        <output-file compare="Text">scan-delete-rtree-secondary-index-nullable.adm</output-file>
+        <output-dir compare="Text">scan-delete-rtree-secondary-index-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="scan-delete-rtree-secondary-index">
-        <output-file compare="Text">scan-delete-rtree-secondary-index.adm</output-file>
+        <output-dir compare="Text">scan-delete-rtree-secondary-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="scan-insert-btree-secondary-index-nullable">
-        <output-file compare="Text">scan-insert-btree-secondary-index-nullable.adm</output-file>
+        <output-dir compare="Text">scan-insert-btree-secondary-index-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="scan-insert-rtree-secondary-index-nullable">
-        <output-file compare="Text">scan-insert-rtree-secondary-index-nullable.adm</output-file>
+        <output-dir compare="Text">scan-insert-rtree-secondary-index-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="dml">
       <compilation-unit name="scan-insert-rtree-secondary-index">
-        <output-file compare="Text">scan-insert-rtree-secondary-index.adm</output-file>
+        <output-dir compare="Text">scan-insert-rtree-secondary-index</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="employee">
     <test-case FilePath="employee">
       <compilation-unit name="q_01">
-        <output-file compare="Text">q_01.adm</output-file>
+        <output-dir compare="Text">q_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="employee">
       <compilation-unit name="q_02">
-        <output-file compare="Text">q_02.adm</output-file>
+        <output-dir compare="Text">q_02</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="failure">
     <test-case FilePath="failure">
       <compilation-unit name="delete-rtree">
-        <output-file compare="Text">delete-rtree.adm</output-file>
+        <output-dir compare="Text">delete-rtree</output-dir>
         <expected-error>edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
       </compilation-unit>
       <compilation-unit name="verify_delete-rtree">
-        <output-file compare="Text">delete-rtree.adm</output-file>
+        <output-dir compare="Text">delete-rtree</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="failure">
       <compilation-unit name="delete">
-        <output-file compare="Text">delete.adm</output-file>
+        <output-dir compare="Text">delete</output-dir>
         <expected-error>edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
       </compilation-unit>
       <compilation-unit name="verify_delete">
-        <output-file compare="Text">delete.adm</output-file>
+        <output-dir compare="Text">delete</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="failure">
       <compilation-unit name="insert-rtree">
-        <output-file compare="Text">insert-rtree.adm</output-file>
+        <output-dir compare="Text">insert-rtree</output-dir>
         <expected-error>edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
       </compilation-unit>
       <compilation-unit name="verify_insert-rtree">
-        <output-file compare="Text">insert-rtree.adm</output-file>
+        <output-dir compare="Text">insert-rtree</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="failure">
       <compilation-unit name="insert">
-        <output-file compare="Text">insert.adm</output-file>
+        <output-dir compare="Text">insert</output-dir>
         <expected-error>edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
       </compilation-unit>
       <compilation-unit name="verify_insert">
-        <output-file compare="Text">insert.adm</output-file>
+        <output-dir compare="Text">insert</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="failure">
       <compilation-unit name="q1_pricing_summary_report_failure">
-        <output-file compare="Text">q1_pricing_summary_report_failure.adm</output-file>
+        <output-dir compare="Text">q1_pricing_summary_report_failure</output-dir>
       </compilation-unit>
     </test-case>
     -->
@@ -982,422 +987,422 @@
   <test-group name="flwor">
     <test-case FilePath="flwor">
       <compilation-unit name="for01">
-        <output-file compare="Text">for01.adm</output-file>
+        <output-dir compare="Text">for01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for02">
-        <output-file compare="Text">for02.adm</output-file>
+        <output-dir compare="Text">for02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for03">
-        <output-file compare="Text">for03.adm</output-file>
+        <output-dir compare="Text">for03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for04">
-        <output-file compare="Text">for04.adm</output-file>
+        <output-dir compare="Text">for04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for05">
-        <output-file compare="Text">for05.adm</output-file>
+        <output-dir compare="Text">for05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for06">
-        <output-file compare="Text">for06.adm</output-file>
+        <output-dir compare="Text">for06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for07">
-        <output-file compare="Text">for07.adm</output-file>
+        <output-dir compare="Text">for07</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for08">
-        <output-file compare="Text">for08.adm</output-file>
+        <output-dir compare="Text">for08</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for09">
-        <output-file compare="Text">for09.adm</output-file>
+        <output-dir compare="Text">for09</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for10">
-        <output-file compare="Text">for10.adm</output-file>
+        <output-dir compare="Text">for10</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for11">
-        <output-file compare="Text">for11.adm</output-file>
+        <output-dir compare="Text">for11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for12">
-        <output-file compare="Text">for12.adm</output-file>
+        <output-dir compare="Text">for12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for13">
-        <output-file compare="Text">for13.adm</output-file>
+        <output-dir compare="Text">for13</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for14">
-        <output-file compare="Text">for14.adm</output-file>
+        <output-dir compare="Text">for14</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for15">
-        <output-file compare="Text">for15.adm</output-file>
+        <output-dir compare="Text">for15</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for16">
-        <output-file compare="Text">for16.adm</output-file>
+        <output-dir compare="Text">for16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for17">
-        <output-file compare="Text">for17.adm</output-file>
+        <output-dir compare="Text">for17</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for18">
-        <output-file compare="Text">for18.adm</output-file>
+        <output-dir compare="Text">for18</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="for19">
-        <output-file compare="Text">for19.adm</output-file>
+        <output-dir compare="Text">for19</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="grpby01">
-        <output-file compare="Text">grpby01.adm</output-file>
+        <output-dir compare="Text">grpby01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="grpby02">
-        <output-file compare="Text">grpby02.adm</output-file>
+        <output-dir compare="Text">grpby02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let01">
-        <output-file compare="Text">let01.adm</output-file>
+        <output-dir compare="Text">let01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let02">
-        <output-file compare="Text">let02.adm</output-file>
+        <output-dir compare="Text">let02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let03">
-        <output-file compare="Text">let03.adm</output-file>
+        <output-dir compare="Text">let03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let04">
-        <output-file compare="Text">let04.adm</output-file>
+        <output-dir compare="Text">let04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let05">
-        <output-file compare="Text">let05.adm</output-file>
+        <output-dir compare="Text">let05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let06">
-        <output-file compare="Text">let06.adm</output-file>
+        <output-dir compare="Text">let06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let07">
-        <output-file compare="Text">let07.adm</output-file>
+        <output-dir compare="Text">let07</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let08">
-        <output-file compare="Text">let08.adm</output-file>
+        <output-dir compare="Text">let08</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let09">
-        <output-file compare="Text">let09.adm</output-file>
+        <output-dir compare="Text">let09</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let10">
-        <output-file compare="Text">let10.adm</output-file>
+        <output-dir compare="Text">let10</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let11">
-        <output-file compare="Text">let11.adm</output-file>
+        <output-dir compare="Text">let11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let12">
-        <output-file compare="Text">let12.adm</output-file>
+        <output-dir compare="Text">let12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let13">
-        <output-file compare="Text">let13.adm</output-file>
+        <output-dir compare="Text">let13</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let14">
-        <output-file compare="Text">let14.adm</output-file>
+        <output-dir compare="Text">let14</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let15">
-        <output-file compare="Text">let15.adm</output-file>
+        <output-dir compare="Text">let15</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let16">
-        <output-file compare="Text">let16.adm</output-file>
+        <output-dir compare="Text">let16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let17">
-        <output-file compare="Text">let17.adm</output-file>
+        <output-dir compare="Text">let17</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let18">
-        <output-file compare="Text">let18.adm</output-file>
+        <output-dir compare="Text">let18</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let19">
-        <output-file compare="Text">let19.adm</output-file>
+        <output-dir compare="Text">let19</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let20">
-        <output-file compare="Text">let20.adm</output-file>
+        <output-dir compare="Text">let20</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let21">
-        <output-file compare="Text">let21.adm</output-file>
+        <output-dir compare="Text">let21</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let22">
-        <output-file compare="Text">let22.adm</output-file>
+        <output-dir compare="Text">let22</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let23">
-        <output-file compare="Text">let23.adm</output-file>
+        <output-dir compare="Text">let23</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let24">
-        <output-file compare="Text">let24.adm</output-file>
+        <output-dir compare="Text">let24</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let25">
-        <output-file compare="Text">let25.adm</output-file>
+        <output-dir compare="Text">let25</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let26">
-        <output-file compare="Text">let26.adm</output-file>
+        <output-dir compare="Text">let26</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let27">
-        <output-file compare="Text">let27.adm</output-file>
+        <output-dir compare="Text">let27</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let28">
-        <output-file compare="Text">let28.adm</output-file>
+        <output-dir compare="Text">let28</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let29">
-        <output-file compare="Text">let29.adm</output-file>
+        <output-dir compare="Text">let29</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let30">
-        <output-file compare="Text">let30.adm</output-file>
+        <output-dir compare="Text">let30</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let31">
-        <output-file compare="Text">let31.adm</output-file>
+        <output-dir compare="Text">let31</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="let32">
-        <output-file compare="Text">let32.adm</output-file>
+        <output-dir compare="Text">let32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-01">
-        <output-file compare="Text">order-by-01.adm</output-file>
+        <output-dir compare="Text">order-by-01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-02">
-        <output-file compare="Text">order-by-02.adm</output-file>
+        <output-dir compare="Text">order-by-02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-03">
-        <output-file compare="Text">order-by-03.adm</output-file>
+        <output-dir compare="Text">order-by-03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-04">
-        <output-file compare="Text">order-by-04.adm</output-file>
+        <output-dir compare="Text">order-by-04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-05">
-        <output-file compare="Text">order-by-05.adm</output-file>
+        <output-dir compare="Text">order-by-05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-06">
-        <output-file compare="Text">order-by-06.adm</output-file>
+        <output-dir compare="Text">order-by-06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-07">
-        <output-file compare="Text">order-by-07.adm</output-file>
+        <output-dir compare="Text">order-by-07</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-08">
-        <output-file compare="Text">order-by-08.adm</output-file>
+        <output-dir compare="Text">order-by-08</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-09">
-        <output-file compare="Text">order-by-09.adm</output-file>
+        <output-dir compare="Text">order-by-09</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-10">
-        <output-file compare="Text">order-by-10.adm</output-file>
+        <output-dir compare="Text">order-by-10</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-11">
-        <output-file compare="Text">order-by-11.adm</output-file>
+        <output-dir compare="Text">order-by-11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="order-by-12">
-        <output-file compare="Text">order-by-12.adm</output-file>
+        <output-dir compare="Text">order-by-12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-01">
-        <output-file compare="Text">ret-01.adm</output-file>
+        <output-dir compare="Text">ret-01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-02">
-        <output-file compare="Text">ret-02.adm</output-file>
+        <output-dir compare="Text">ret-02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-03">
-        <output-file compare="Text">ret-03.adm</output-file>
+        <output-dir compare="Text">ret-03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-04">
-        <output-file compare="Text">ret-04.adm</output-file>
+        <output-dir compare="Text">ret-04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-05">
-        <output-file compare="Text">ret-05.adm</output-file>
+        <output-dir compare="Text">ret-05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-06">
-        <output-file compare="Text">ret-06.adm</output-file>
+        <output-dir compare="Text">ret-06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-07">
-        <output-file compare="Text">ret-07.adm</output-file>
+        <output-dir compare="Text">ret-07</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-08">
-        <output-file compare="Text">ret-08.adm</output-file>
+        <output-dir compare="Text">ret-08</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-09">
-        <output-file compare="Text">ret-09.adm</output-file>
+        <output-dir compare="Text">ret-09</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-10">
-        <output-file compare="Text">ret-10.adm</output-file>
+        <output-dir compare="Text">ret-10</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-11">
-        <output-file compare="Text">ret-11.adm</output-file>
+        <output-dir compare="Text">ret-11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-12">
-        <output-file compare="Text">ret-12.adm</output-file>
+        <output-dir compare="Text">ret-12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-13">
-        <output-file compare="Text">ret-13.adm</output-file>
+        <output-dir compare="Text">ret-13</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-14">
-        <output-file compare="Text">ret-14.adm</output-file>
+        <output-dir compare="Text">ret-14</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-15">
-        <output-file compare="Text">ret-15.adm</output-file>
+        <output-dir compare="Text">ret-15</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-16">
-        <output-file compare="Text">ret-16.adm</output-file>
+        <output-dir compare="Text">ret-16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-17">
-        <output-file compare="Text">ret-17.adm</output-file>
+        <output-dir compare="Text">ret-17</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-18">
-        <output-file compare="Text">ret-18.adm</output-file>
+        <output-dir compare="Text">ret-18</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="flwor">
       <compilation-unit name="ret-19">
-        <output-file compare="Text">ret-19.adm</output-file>
+        <output-dir compare="Text">ret-19</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
@@ -1405,234 +1410,234 @@
   <test-group name="fuzzyjoin">
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-1_1">
-        <output-file compare="Text">dblp-1_1.adm</output-file>
+        <output-dir compare="Text">dblp-1_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-1_2.1.1">
-        <output-file compare="Text">dblp-1_2.1.1.adm</output-file>
+        <output-dir compare="Text">dblp-1_2.1.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-1_2.1">
-        <output-file compare="Text">dblp-1_2.1.adm</output-file>
+        <output-dir compare="Text">dblp-1_2.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-1_2">
-        <output-file compare="Text">dblp-1_2.adm</output-file>
+        <output-dir compare="Text">dblp-1_2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2.1_5.3.1">
-        <output-file compare="Text">dblp-2.1_5.3.1.adm</output-file>
+        <output-dir compare="Text">dblp-2.1_5.3.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_1">
-        <output-file compare="Text">dblp-2_1.adm</output-file>
+        <output-dir compare="Text">dblp-2_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_2">
-        <output-file compare="Text">dblp-2_2.adm</output-file>
+        <output-dir compare="Text">dblp-2_2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2.2">
-        <output-file compare="Text">dblp-2.2.adm</output-file>
+        <output-dir compare="Text">dblp-2.2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_3">
-        <output-file compare="Text">dblp-2_3.adm</output-file>
+        <output-dir compare="Text">dblp-2_3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_4">
-        <output-file compare="Text">dblp-2_4.adm</output-file>
+        <output-dir compare="Text">dblp-2_4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_5.1">
-        <output-file compare="Text">dblp-2_5.1.adm</output-file>
+        <output-dir compare="Text">dblp-2_5.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_5.2">
-        <output-file compare="Text">dblp-2_5.2.adm</output-file>
+        <output-dir compare="Text">dblp-2_5.2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_5.3.1">
-        <output-file compare="Text">dblp-2_5.3.1.adm</output-file>
+        <output-dir compare="Text">dblp-2_5.3.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_5.3">
-        <output-file compare="Text">dblp-2_5.3.adm</output-file>
+        <output-dir compare="Text">dblp-2_5.3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_5">
-        <output-file compare="Text">dblp-2_5.adm</output-file>
+        <output-dir compare="Text">dblp-2_5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-3_1.1">
-        <output-file compare="Text">dblp-3_1.1.adm</output-file>
+        <output-dir compare="Text">dblp-3_1.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-3_1.2">
-        <output-file compare="Text">dblp-3_1.2.adm</output-file>
+        <output-dir compare="Text">dblp-3_1.2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-3_1">
-        <output-file compare="Text">dblp-3_1.adm</output-file>
+        <output-dir compare="Text">dblp-3_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-aqlplus_1">
-        <output-file compare="Text">dblp-aqlplus_1.adm</output-file>
+        <output-dir compare="Text">dblp-aqlplus_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-aqlplus_2">
-        <output-file compare="Text">dblp-aqlplus_2.adm</output-file>
+        <output-dir compare="Text">dblp-aqlplus_2</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_1">
-        <output-file compare="Text">dblp-csx-2_1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_2">
-        <output-file compare="Text">dblp-csx-2_2.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_3">
-        <output-file compare="Text">dblp-csx-2_3.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_4">
-        <output-file compare="Text">dblp-csx-2_4.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_5.1">
-        <output-file compare="Text">dblp-csx-2_5.1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_5.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_5.2">
-        <output-file compare="Text">dblp-csx-2_5.2.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_5.2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_5.3.1">
-        <output-file compare="Text">dblp-csx-2_5.3.1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_5.3.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_5.3">
-        <output-file compare="Text">dblp-csx-2_5.3.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_5.3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-2_5">
-        <output-file compare="Text">dblp-csx-2_5.adm</output-file>
+        <output-dir compare="Text">dblp-csx-2_5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_1">
-        <output-file compare="Text">dblp-csx-3_1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_2">
-        <output-file compare="Text">dblp-csx-3_2.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_3">
-        <output-file compare="Text">dblp-csx-3_3.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_4">
-        <output-file compare="Text">dblp-csx-3_4.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5.1">
-        <output-file compare="Text">dblp-csx-3_5.1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5.2">
-        <output-file compare="Text">dblp-csx-3_5.2.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5.2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5.3.1">
-        <output-file compare="Text">dblp-csx-3_5.3.1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5.3.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5.3">
-        <output-file compare="Text">dblp-csx-3_5.3.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5.3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5.4.1">
-        <output-file compare="Text">dblp-csx-3_5.4.1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5.4.1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5.4">
-        <output-file compare="Text">dblp-csx-3_5.4.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5.4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-3_5">
-        <output-file compare="Text">dblp-csx-3_5.adm</output-file>
+        <output-dir compare="Text">dblp-csx-3_5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-aqlplus_1">
-        <output-file compare="Text">dblp-csx-aqlplus_1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-aqlplus_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-aqlplus_2">
-        <output-file compare="Text">dblp-csx-aqlplus_2.adm</output-file>
+        <output-dir compare="Text">dblp-csx-aqlplus_2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-aqlplus_3">
-        <output-file compare="Text">dblp-csx-aqlplus_3.adm</output-file>
+        <output-dir compare="Text">dblp-csx-aqlplus_3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-csx-dblp-aqlplus_1">
-        <output-file compare="Text">dblp-csx-dblp-aqlplus_1.adm</output-file>
+        <output-dir compare="Text">dblp-csx-dblp-aqlplus_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-lookup_1">
-        <output-file compare="Text">dblp-lookup_1.adm</output-file>
+        <output-dir compare="Text">dblp-lookup_1</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-splits-3_1">
-        <output-file compare="Text">dblp-splits-3_1.adm</output-file>
+        <output-dir compare="Text">dblp-splits-3_1</output-dir>
       </compilation-unit>
     </test-case>
     -->
@@ -1640,757 +1645,757 @@
   <test-group name="index-join">
     <test-case FilePath="index-join">
       <compilation-unit name="btree-primary-equi-join">
-        <output-file compare="Text">btree-primary-equi-join.adm</output-file>
+        <output-dir compare="Text">btree-primary-equi-join</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-join">
       <compilation-unit name="btree-secondary-equi-join">
-        <output-file compare="Text">btree-secondary-equi-join.adm</output-file>
+        <output-dir compare="Text">btree-secondary-equi-join</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-join">
       <compilation-unit name="rtree-spatial-intersect-point">
-        <output-file compare="Text">rtree-spatial-intersect-point.adm</output-file>
+        <output-dir compare="Text">rtree-spatial-intersect-point</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="index-selection">
     <test-case FilePath="index-selection">
       <compilation-unit name="btree-index-composite-key">
-        <output-file compare="Text">btree-index-composite-key.adm</output-file>
+        <output-dir compare="Text">btree-index-composite-key</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="btree-index-composite-key-mixed-intervals">
-        <output-file compare="Text">btree-index-composite-key-mixed-intervals.adm</output-file>
+        <output-dir compare="Text">btree-index-composite-key-mixed-intervals</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="btree-index-rewrite-multiple">
-        <output-file compare="Text">btree-index-rewrite-multiple.adm</output-file>
+        <output-dir compare="Text">btree-index-rewrite-multiple</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="cust-index-age-nullable">
-        <output-file compare="Text">cust-index-age-nullable.adm</output-file>
+        <output-dir compare="Text">cust-index-age-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-ngram-contains">
-        <output-file compare="Text">fuzzy-inverted-index-ngram-contains.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-ngram-contains</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-ngram-edit-distance-panic">
-        <output-file compare="Text">fuzzy-inverted-index-ngram-edit-distance-panic.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-ngram-edit-distance-panic</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-ngram-edit-distance">
-        <output-file compare="Text">fuzzy-inverted-index-ngram-edit-distance.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-ngram-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-ngram-jaccard">
-        <output-file compare="Text">fuzzy-inverted-index-ngram-jaccard.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-ngram-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-olist-edit-distance-panic">
-        <output-file compare="Text">fuzzy-inverted-index-olist-edit-distance-panic.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-olist-edit-distance-panic</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-olist-edit-distance">
-        <output-file compare="Text">fuzzy-inverted-index-olist-edit-distance.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-olist-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-olist-jaccard">
-        <output-file compare="Text">fuzzy-inverted-index-olist-jaccard.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-olist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-ulist-jaccard">
-        <output-file compare="Text">fuzzy-inverted-index-ulist-jaccard.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-ulist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-word-contains">
-        <output-file compare="Text">fuzzy-inverted-index-word-contains.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-word-contains</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="fuzzy-inverted-index-word-jaccard">
-        <output-file compare="Text">fuzzy-inverted-index-word-jaccard.adm</output-file>
+        <output-dir compare="Text">fuzzy-inverted-index-word-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-ngram-contains">
-        <output-file compare="Text">inverted-index-ngram-contains.adm</output-file>
+        <output-dir compare="Text">inverted-index-ngram-contains</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-ngram-edit-distance-panic">
-        <output-file compare="Text">inverted-index-ngram-edit-distance-panic.adm</output-file>
+        <output-dir compare="Text">inverted-index-ngram-edit-distance-panic</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-ngram-edit-distance">
-        <output-file compare="Text">inverted-index-ngram-edit-distance.adm</output-file>
+        <output-dir compare="Text">inverted-index-ngram-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-ngram-jaccard">
-        <output-file compare="Text">inverted-index-ngram-jaccard.adm</output-file>
+        <output-dir compare="Text">inverted-index-ngram-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-olist-edit-distance-panic">
-        <output-file compare="Text">inverted-index-olist-edit-distance-panic.adm</output-file>
+        <output-dir compare="Text">inverted-index-olist-edit-distance-panic</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-olist-edit-distance">
-        <output-file compare="Text">inverted-index-olist-edit-distance.adm</output-file>
+        <output-dir compare="Text">inverted-index-olist-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-olist-jaccard">
-        <output-file compare="Text">inverted-index-olist-jaccard.adm</output-file>
+        <output-dir compare="Text">inverted-index-olist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-ulist-jaccard">
-        <output-file compare="Text">inverted-index-ulist-jaccard.adm</output-file>
+        <output-dir compare="Text">inverted-index-ulist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-word-contains">
-        <output-file compare="Text">inverted-index-word-contains.adm</output-file>
+        <output-dir compare="Text">inverted-index-word-contains</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="inverted-index-word-jaccard">
-        <output-file compare="Text">inverted-index-word-jaccard.adm</output-file>
+        <output-dir compare="Text">inverted-index-word-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="orders-index-custkey-conjunctive-open">
-        <output-file compare="Text">orders-index-custkey-conjunctive-open.adm</output-file>
+        <output-dir compare="Text">orders-index-custkey-conjunctive-open</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="orders-index-custkey-conjunctive">
-        <output-file compare="Text">orders-index-custkey-conjunctive.adm</output-file>
+        <output-dir compare="Text">orders-index-custkey-conjunctive</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="orders-index-custkey-open">
-        <output-file compare="Text">orders-index-custkey-open.adm</output-file>
+        <output-dir compare="Text">orders-index-custkey-open</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="orders-index-custkey">
-        <output-file compare="Text">orders-index-custkey.adm</output-file>
+        <output-dir compare="Text">orders-index-custkey</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="range-search-open">
-        <output-file compare="Text">range-search-open.adm</output-file>
+        <output-dir compare="Text">range-search-open</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="range-search">
-        <output-file compare="Text">range-search.adm</output-file>
+        <output-dir compare="Text">range-search</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="rtree-secondary-index-nullable">
-        <output-file compare="Text">rtree-secondary-index-nullable.adm</output-file>
+        <output-dir compare="Text">rtree-secondary-index-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="rtree-secondary-index-open">
-        <output-file compare="Text">rtree-secondary-index-open.adm</output-file>
+        <output-dir compare="Text">rtree-secondary-index-open</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
       <compilation-unit name="rtree-secondary-index">
-        <output-file compare="Text">rtree-secondary-index.adm</output-file>
+        <output-dir compare="Text">rtree-secondary-index</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="inverted-index-join">
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="ngram-edit-distance">
-        <output-file compare="Text">ngram-edit-distance.adm</output-file>
+        <output-dir compare="Text">ngram-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="ngram-edit-distance-inline">
-        <output-file compare="Text">ngram-edit-distance-inline.adm</output-file>
+        <output-dir compare="Text">ngram-edit-distance-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="ngram-jaccard">
-        <output-file compare="Text">ngram-jaccard.adm</output-file>
+        <output-dir compare="Text">ngram-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="ngram-jaccard-inline">
-        <output-file compare="Text">ngram-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">ngram-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="olist-edit-distance">
-        <output-file compare="Text">olist-edit-distance.adm</output-file>
+        <output-dir compare="Text">olist-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="olist-edit-distance-inline">
-        <output-file compare="Text">olist-edit-distance-inline.adm</output-file>
+        <output-dir compare="Text">olist-edit-distance-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="olist-jaccard">
-        <output-file compare="Text">olist-jaccard.adm</output-file>
+        <output-dir compare="Text">olist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="olist-jaccard-inline">
-        <output-file compare="Text">olist-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">olist-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="ulist-jaccard">
-        <output-file compare="Text">ulist-jaccard.adm</output-file>
+        <output-dir compare="Text">ulist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="ulist-jaccard-inline">
-        <output-file compare="Text">ulist-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">ulist-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="word-jaccard">
-        <output-file compare="Text">word-jaccard.adm</output-file>
+        <output-dir compare="Text">word-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join">
       <compilation-unit name="word-jaccard-inline">
-        <output-file compare="Text">word-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">word-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="inverted-index-join-noeqjoin">
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="ngram-edit-distance">
-        <output-file compare="Text">ngram-edit-distance.adm</output-file>
+        <output-dir compare="Text">ngram-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="ngram-edit-distance-inline">
-        <output-file compare="Text">ngram-edit-distance-inline.adm</output-file>
+        <output-dir compare="Text">ngram-edit-distance-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="ngram-jaccard">
-        <output-file compare="Text">ngram-jaccard.adm</output-file>
+        <output-dir compare="Text">ngram-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="ngram-jaccard-inline">
-        <output-file compare="Text">ngram-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">ngram-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="olist-edit-distance">
-        <output-file compare="Text">olist-edit-distance.adm</output-file>
+        <output-dir compare="Text">olist-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="olist-edit-distance-inline">
-        <output-file compare="Text">olist-edit-distance-inline.adm</output-file>
+        <output-dir compare="Text">olist-edit-distance-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="olist-jaccard">
-        <output-file compare="Text">olist-jaccard.adm</output-file>
+        <output-dir compare="Text">olist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="olist-jaccard-inline">
-        <output-file compare="Text">olist-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">olist-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="ulist-jaccard">
-        <output-file compare="Text">ulist-jaccard.adm</output-file>
+        <output-dir compare="Text">ulist-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="ulist-jaccard-inline">
-        <output-file compare="Text">ulist-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">ulist-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="word-jaccard">
-        <output-file compare="Text">word-jaccard.adm</output-file>
+        <output-dir compare="Text">word-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="inverted-index-join-noeqjoin">
       <compilation-unit name="word-jaccard-inline">
-        <output-file compare="Text">word-jaccard-inline.adm</output-file>
+        <output-dir compare="Text">word-jaccard-inline</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="list">
     <test-case FilePath="list">
       <compilation-unit name="any-collection-member_01">
-        <output-file compare="Text">any-collection-member_01.adm</output-file>
+        <output-dir compare="Text">any-collection-member_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="get-item_01">
-        <output-file compare="Text">get-item_01.adm</output-file>
+        <output-dir compare="Text">get-item_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="len_01">
-        <output-file compare="Text">len_01.adm</output-file>
+        <output-dir compare="Text">len_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="len_null_01">
-        <output-file compare="Text">len_null_01.adm</output-file>
+        <output-dir compare="Text">len_null_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="listify_01">
-        <output-file compare="Text">listify_01.adm</output-file>
+        <output-dir compare="Text">listify_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="listify_02">
-        <output-file compare="Text">listify_02.adm</output-file>
+        <output-dir compare="Text">listify_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="listify_03">
-        <output-file compare="Text">listify_03.adm</output-file>
+        <output-dir compare="Text">listify_03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="ordered-list-constructor_01">
-        <output-file compare="Text">ordered-list-constructor_01.adm</output-file>
+        <output-dir compare="Text">ordered-list-constructor_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="ordered-list-constructor_02">
-        <output-file compare="Text">ordered-list-constructor_02.adm</output-file>
+        <output-dir compare="Text">ordered-list-constructor_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="ordered-list-constructor_03">
-        <output-file compare="Text">ordered-list-constructor_03.adm</output-file>
+        <output-dir compare="Text">ordered-list-constructor_03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="scan-collection_01">
-        <output-file compare="Text">scan-collection_01.adm</output-file>
+        <output-dir compare="Text">scan-collection_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="union_01">
-        <output-file compare="Text">union_01.adm</output-file>
+        <output-dir compare="Text">union_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="union_02">
-        <output-file compare="Text">union_02.adm</output-file>
+        <output-dir compare="Text">union_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="unordered-list-constructor_01">
-        <output-file compare="Text">unordered-list-constructor_01.adm</output-file>
+        <output-dir compare="Text">unordered-list-constructor_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="unordered-list-constructor_02">
-        <output-file compare="Text">unordered-list-constructor_02.adm</output-file>
+        <output-dir compare="Text">unordered-list-constructor_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="list">
       <compilation-unit name="unordered-list-constructor_03">
-        <output-file compare="Text">unordered-list-constructor_03.adm</output-file>
+        <output-dir compare="Text">unordered-list-constructor_03</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="misc">
   <test-case FilePath="misc">
       <compilation-unit name="partition-by-nonexistent-field">
-        <output-file compare="Text">partition-by-nonexistent-field.adm</output-file>
+        <output-dir compare="Text">partition-by-nonexistent-field</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="float_01">
-        <output-file compare="Text">float_01.adm</output-file>
+        <output-dir compare="Text">float_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="groupby-orderby-count">
-        <output-file compare="Text">groupby-orderby-count.adm</output-file>
+        <output-dir compare="Text">groupby-orderby-count</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="ifthenelse_01">
-        <output-file compare="Text">ifthenelse_01.adm</output-file>
+        <output-dir compare="Text">ifthenelse_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="is-null_01">
-        <output-file compare="Text">is-null_01.adm</output-file>
+        <output-dir compare="Text">is-null_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="nested-loop-join_01">
-        <output-file compare="Text">nested-loop-join_01.adm</output-file>
+        <output-dir compare="Text">nested-loop-join_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="range_01">
-        <output-file compare="Text">range_01.adm</output-file>
+        <output-dir compare="Text">range_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="tid_01">
-        <output-file compare="Text">tid_01.adm</output-file>
+        <output-dir compare="Text">tid_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="misc">
       <compilation-unit name="year_01">
-        <output-file compare="Text">year_01.adm</output-file>
+        <output-dir compare="Text">year_01</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="nestrecords">
     <test-case FilePath="nestrecords">
       <compilation-unit name="nestrecord">
-        <output-file compare="Text">nestrecord.adm</output-file>
+        <output-dir compare="Text">nestrecord</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="numeric">
     <test-case FilePath="numeric">
       <compilation-unit name="abs0">
-        <output-file compare="Text">abs0.adm</output-file>
+        <output-dir compare="Text">abs0</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="abs1">
-        <output-file compare="Text">abs1.adm</output-file>
+        <output-dir compare="Text">abs1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="abs2">
-        <output-file compare="Text">abs2.adm</output-file>
+        <output-dir compare="Text">abs2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="abs3">
-        <output-file compare="Text">abs3.adm</output-file>
+        <output-dir compare="Text">abs3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="abs4">
-        <output-file compare="Text">abs4.adm</output-file>
+        <output-dir compare="Text">abs4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="add_double">
-        <output-file compare="Text">add_double.adm</output-file>
+        <output-dir compare="Text">add_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="add_float">
-        <output-file compare="Text">add_float.adm</output-file>
+        <output-dir compare="Text">add_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="add_int16">
-        <output-file compare="Text">add_int16.adm</output-file>
+        <output-dir compare="Text">add_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="add_int32">
-        <output-file compare="Text">add_int32.adm</output-file>
+        <output-dir compare="Text">add_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="add_int64">
-        <output-file compare="Text">add_int64.adm</output-file>
+        <output-dir compare="Text">add_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="add_int8">
-        <output-file compare="Text">add_int8.adm</output-file>
+        <output-dir compare="Text">add_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="ceiling0">
-        <output-file compare="Text">ceiling0.adm</output-file>
+        <output-dir compare="Text">ceiling0</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="ceiling1">
-        <output-file compare="Text">ceiling1.adm</output-file>
+        <output-dir compare="Text">ceiling1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="ceiling2">
-        <output-file compare="Text">ceiling2.adm</output-file>
+        <output-dir compare="Text">ceiling2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="ceiling3">
-        <output-file compare="Text">ceiling3.adm</output-file>
+        <output-dir compare="Text">ceiling3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="ceiling4">
-        <output-file compare="Text">ceiling4.adm</output-file>
+        <output-dir compare="Text">ceiling4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="divide_double">
-        <output-file compare="Text">divide_double.adm</output-file>
+        <output-dir compare="Text">divide_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="divide_float">
-        <output-file compare="Text">divide_float.adm</output-file>
+        <output-dir compare="Text">divide_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="divide_int16">
-        <output-file compare="Text">divide_int16.adm</output-file>
+        <output-dir compare="Text">divide_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="divide_int32">
-        <output-file compare="Text">divide_int32.adm</output-file>
+        <output-dir compare="Text">divide_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="divide_int64">
-        <output-file compare="Text">divide_int64.adm</output-file>
+        <output-dir compare="Text">divide_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="divide_int8">
-        <output-file compare="Text">divide_int8.adm</output-file>
+        <output-dir compare="Text">divide_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="floor0">
-        <output-file compare="Text">floor0.adm</output-file>
+        <output-dir compare="Text">floor0</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="floor1">
-        <output-file compare="Text">floor1.adm</output-file>
+        <output-dir compare="Text">floor1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="floor2">
-        <output-file compare="Text">floor2.adm</output-file>
+        <output-dir compare="Text">floor2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="floor3">
-        <output-file compare="Text">floor3.adm</output-file>
+        <output-dir compare="Text">floor3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="floor4">
-        <output-file compare="Text">floor4.adm</output-file>
+        <output-dir compare="Text">floor4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="multiply_double">
-        <output-file compare="Text">multiply_double.adm</output-file>
+        <output-dir compare="Text">multiply_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="multiply_float">
-        <output-file compare="Text">multiply_float.adm</output-file>
+        <output-dir compare="Text">multiply_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="multiply_int16">
-        <output-file compare="Text">multiply_int16.adm</output-file>
+        <output-dir compare="Text">multiply_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="multiply_int32">
-        <output-file compare="Text">multiply_int32.adm</output-file>
+        <output-dir compare="Text">multiply_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="multiply_int64">
-        <output-file compare="Text">multiply_int64.adm</output-file>
+        <output-dir compare="Text">multiply_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="multiply_int8">
-        <output-file compare="Text">multiply_int8.adm</output-file>
+        <output-dir compare="Text">multiply_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even0">
-        <output-file compare="Text">round-half-to-even0.adm</output-file>
+        <output-dir compare="Text">round-half-to-even0</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even1">
-        <output-file compare="Text">round-half-to-even1.adm</output-file>
+        <output-dir compare="Text">round-half-to-even1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even2">
-        <output-file compare="Text">round-half-to-even2.adm</output-file>
+        <output-dir compare="Text">round-half-to-even2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even20">
-        <output-file compare="Text">round-half-to-even20.adm</output-file>
+        <output-dir compare="Text">round-half-to-even20</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even21">
-        <output-file compare="Text">round-half-to-even21.adm</output-file>
+        <output-dir compare="Text">round-half-to-even21</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even22">
-        <output-file compare="Text">round-half-to-even22.adm</output-file>
+        <output-dir compare="Text">round-half-to-even22</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even23">
-        <output-file compare="Text">round-half-to-even23.adm</output-file>
+        <output-dir compare="Text">round-half-to-even23</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even24">
-        <output-file compare="Text">round-half-to-even24.adm</output-file>
+        <output-dir compare="Text">round-half-to-even24</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even3">
-        <output-file compare="Text">round-half-to-even3.adm</output-file>
+        <output-dir compare="Text">round-half-to-even3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even4">
-        <output-file compare="Text">round-half-to-even4.adm</output-file>
+        <output-dir compare="Text">round-half-to-even4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round-half-to-even5">
-        <output-file compare="Text">round-half-to-even5.adm</output-file>
+        <output-dir compare="Text">round-half-to-even5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round0">
-        <output-file compare="Text">round0.adm</output-file>
+        <output-dir compare="Text">round0</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round1">
-        <output-file compare="Text">round1.adm</output-file>
+        <output-dir compare="Text">round1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round2">
-        <output-file compare="Text">round2.adm</output-file>
+        <output-dir compare="Text">round2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round3">
-        <output-file compare="Text">round3.adm</output-file>
+        <output-dir compare="Text">round3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="round4">
-        <output-file compare="Text">round4.adm</output-file>
+        <output-dir compare="Text">round4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="subtract_double">
-        <output-file compare="Text">subtract_double.adm</output-file>
+        <output-dir compare="Text">subtract_double</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="subtract_float">
-        <output-file compare="Text">subtract_float.adm</output-file>
+        <output-dir compare="Text">subtract_float</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="subtract_int16">
-        <output-file compare="Text">subtract_int16.adm</output-file>
+        <output-dir compare="Text">subtract_int16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="subtract_int32">
-        <output-file compare="Text">subtract_int32.adm</output-file>
+        <output-dir compare="Text">subtract_int32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="subtract_int64">
-        <output-file compare="Text">subtract_int64.adm</output-file>
+        <output-dir compare="Text">subtract_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="subtract_int8">
-        <output-file compare="Text">subtract_int8.adm</output-file>
+        <output-dir compare="Text">subtract_int8</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_double_01">
-        <output-file compare="Text">unary-minus_double_01.adm</output-file>
+        <output-dir compare="Text">unary-minus_double_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_double_02">
-        <output-file compare="Text">unary-minus_double_02.adm</output-file>
+        <output-dir compare="Text">unary-minus_double_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_float_01">
-        <output-file compare="Text">unary-minus_float_01.adm</output-file>
+        <output-dir compare="Text">unary-minus_float_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_float_02">
-        <output-file compare="Text">unary-minus_float_02.adm</output-file>
+        <output-dir compare="Text">unary-minus_float_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_int_01">
-        <output-file compare="Text">unary-minus_int_01.adm</output-file>
+        <output-dir compare="Text">unary-minus_int_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_int_02">
-        <output-file compare="Text">unary-minus_int_02.adm</output-file>
+        <output-dir compare="Text">unary-minus_int_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="numeric">
       <compilation-unit name="unary-minus_null">
-        <output-file compare="Text">unary-minus_null.adm</output-file>
+        <output-dir compare="Text">unary-minus_null</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
@@ -2398,320 +2403,320 @@
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="c2c-w-optional">
-        <output-file compare="Text">c2c-w-optional.adm</output-file>
+        <output-dir compare="Text">c2c-w-optional</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="c2c-wo-optional">
-        <output-file compare="Text">c2c-wo-optional.adm</output-file>
+        <output-dir compare="Text">c2c-wo-optional</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="c2c">
-        <output-file compare="Text">c2c.adm</output-file>
+        <output-dir compare="Text">c2c</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="open-closed">
       <compilation-unit name="heterog-list-ordered01">
-        <output-file compare="Text">heterog-list-ordered01.adm</output-file>
+        <output-dir compare="Text">heterog-list-ordered01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="heterog-list01">
-        <output-file compare="Text">heterog-list01.adm</output-file>
+        <output-dir compare="Text">heterog-list01</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="heterog-list02">
-        <output-file compare="Text">heterog-list02.adm</output-file>
+        <output-dir compare="Text">heterog-list02</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="heterog-list03">
-        <output-file compare="Text">heterog-list03.adm</output-file>
+        <output-dir compare="Text">heterog-list03</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-01">
-        <output-file compare="Text">open-closed-01.adm</output-file>
+        <output-dir compare="Text">open-closed-01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-12">
-        <output-file compare="Text">open-closed-12.adm</output-file>
+        <output-dir compare="Text">open-closed-12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-14">
-        <output-file compare="Text">open-closed-14.adm</output-file>
+        <output-dir compare="Text">open-closed-14</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-issue134">
-        <output-file compare="Text">query-issue134.adm</output-file>
+        <output-dir compare="Text">query-issue134</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-issue55">
-        <output-file compare="Text">query-issue55.adm</output-file>
+        <output-dir compare="Text">query-issue55</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-issue55-1">
-        <output-file compare="Text">query-issue55-1.adm</output-file>
+        <output-dir compare="Text">query-issue55-1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-issue166">
-        <output-file compare="Text">query-issue166.adm</output-file>
+        <output-dir compare="Text">query-issue166</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-issue208">
-        <output-file compare="Text">query-issue208.adm</output-file>
+        <output-dir compare="Text">query-issue208</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-issue236">
-       <output-file compare="Text">query-issue236.adm</output-file>
+       <output-dir compare="Text">query-issue236</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-15">
-        <output-file compare="Text">open-closed-15.adm</output-file>
+        <output-dir compare="Text">open-closed-15</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-16">
-        <output-file compare="Text">open-closed-16.adm</output-file>
+        <output-dir compare="Text">open-closed-16</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-17">
-        <output-file compare="Text">open-closed-17.adm</output-file>
+        <output-dir compare="Text">open-closed-17</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-19">
-        <output-file compare="Text">open-closed-19.adm</output-file>
+        <output-dir compare="Text">open-closed-19</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-20">
-        <output-file compare="Text">open-closed-20.adm</output-file>
+        <output-dir compare="Text">open-closed-20</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-21">
-        <output-file compare="Text">open-closed-21.adm</output-file>
+        <output-dir compare="Text">open-closed-21</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-22">
-        <output-file compare="Text">open-closed-22.adm</output-file>
+        <output-dir compare="Text">open-closed-22</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-24">
-        <output-file compare="Text">open-closed-24.adm</output-file>
+        <output-dir compare="Text">open-closed-24</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-25">
-        <output-file compare="Text">open-closed-25.adm</output-file>
+        <output-dir compare="Text">open-closed-25</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-26">
-        <output-file compare="Text">open-closed-26.adm</output-file>
+        <output-dir compare="Text">open-closed-26</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-28">
-        <output-file compare="Text">open-closed-28.adm</output-file>
+        <output-dir compare="Text">open-closed-28</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-29">
-        <output-file compare="Text">open-closed-29.adm</output-file>
+        <output-dir compare="Text">open-closed-29</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-30">
-        <output-file compare="Text">open-closed-30.adm</output-file>
+        <output-dir compare="Text">open-closed-30</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-31">
-        <output-file compare="Text">open-closed-31.adm</output-file>
+        <output-dir compare="Text">open-closed-31</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-32">
-        <output-file compare="Text">open-closed-32.adm</output-file>
+        <output-dir compare="Text">open-closed-32</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="open-closed-33">
-        <output-file compare="Text">open-closed-33.adm</output-file>
+        <output-dir compare="Text">open-closed-33</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-proposal02">
-        <output-file compare="Text">query-proposal02.adm</output-file>
+        <output-dir compare="Text">query-proposal02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="open-closed">
       <compilation-unit name="query-proposal">
-        <output-file compare="Text">query-proposal.adm</output-file>
+        <output-dir compare="Text">query-proposal</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="quantifiers">
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_01">
-        <output-file compare="Text">everysat_01.adm</output-file>
+        <output-dir compare="Text">everysat_01</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_02">
-        <output-file compare="Text">everysat_02.adm</output-file>
+        <output-dir compare="Text">everysat_02</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_03">
-        <output-file compare="Text">everysat_03.adm</output-file>
+        <output-dir compare="Text">everysat_03</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_04">
-        <output-file compare="Text">everysat_04.adm</output-file>
+        <output-dir compare="Text">everysat_04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_01">
-        <output-file compare="Text">somesat_01.adm</output-file>
+        <output-dir compare="Text">somesat_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_02">
-        <output-file compare="Text">somesat_02.adm</output-file>
+        <output-dir compare="Text">somesat_02</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_03">
-        <output-file compare="Text">somesat_03.adm</output-file>
+        <output-dir compare="Text">somesat_03</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_04">
-        <output-file compare="Text">somesat_04.adm</output-file>
+        <output-dir compare="Text">somesat_04</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_05">
-        <output-file compare="Text">somesat_05.adm</output-file>
+        <output-dir compare="Text">somesat_05</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_06">
-        <output-file compare="Text">somesat_06.adm</output-file>
+        <output-dir compare="Text">somesat_06</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="records">
     <test-case FilePath="records">
       <compilation-unit name="closed-record-constructor_01">
-        <output-file compare="Text">closed-record-constructor_01.adm</output-file>
+        <output-dir compare="Text">closed-record-constructor_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="closed-record-constructor_02">
-        <output-file compare="Text">closed-record-constructor_02.adm</output-file>
+        <output-dir compare="Text">closed-record-constructor_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="closed-record-constructor_03">
-        <output-file compare="Text">closed-record-constructor_03.adm</output-file>
+        <output-dir compare="Text">closed-record-constructor_03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="expFieldName">
-        <output-file compare="Text">expFieldName.adm</output-file>
+        <output-dir compare="Text">expFieldName</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="field-access-by-index_01">
-        <output-file compare="Text">field-access-by-index_01.adm</output-file>
+        <output-dir compare="Text">field-access-by-index_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="field-access-on-open-field">
-        <output-file compare="Text">field-access-on-open-field.adm</output-file>
+        <output-dir compare="Text">field-access-on-open-field</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="open-record-constructor_01">
-        <output-file compare="Text">open-record-constructor_01.adm</output-file>
+        <output-dir compare="Text">open-record-constructor_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="open-record-constructor_02">
-        <output-file compare="Text">open-record-constructor_02.adm</output-file>
+        <output-dir compare="Text">open-record-constructor_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="closed-closed-fieldname-conflict_issue173">
-        <output-file compare="Text">closed-closed-fieldname-conflict_issue173.adm</output-file>
+        <output-dir compare="Text">closed-closed-fieldname-conflict_issue173</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
   <test-case FilePath="records">
       <compilation-unit name="open-closed-fieldname-conflict_issue173">
-        <output-file compare="Text">open-closed-fieldname-conflict_issue173.adm</output-file>
+        <output-dir compare="Text">open-closed-fieldname-conflict_issue173</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="records">
       <compilation-unit name="open-open-fieldname-conflict_issue173">
-        <output-file compare="Text">open-open-fieldname-conflict_issue173.adm</output-file>
+        <output-dir compare="Text">open-open-fieldname-conflict_issue173</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
@@ -2719,71 +2724,71 @@
   <test-group name="scan">
     <test-case FilePath="scan">
       <compilation-unit name="10">
-        <output-file compare="Text">10.adm</output-file>
+        <output-dir compare="Text">10</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="20">
-        <output-file compare="Text">20.adm</output-file>
+        <output-dir compare="Text">20</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="issue238_query_1">
-        <output-file compare="Text">issue238_query_1.adm</output-file>
+        <output-dir compare="Text">issue238_query_1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="issue238_query_2">
-        <output-file compare="Text">issue238_query_2.adm</output-file>
+        <output-dir compare="Text">issue238_query_2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="invalid-scan-syntax">
-        <output-file compare="Text">invalid-scan-syntax.adm</output-file>
+        <output-dir compare="Text">invalid-scan-syntax</output-dir>
         <expected-error>SyntaxError</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="30">
-        <output-file compare="Text">30.adm</output-file>
+        <output-dir compare="Text">30</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="alltypes_01">
-        <output-file compare="Text">alltypes_01.adm</output-file>
+        <output-dir compare="Text">alltypes_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="alltypes_02">
-        <output-file compare="Text">alltypes_02.adm</output-file>
+        <output-dir compare="Text">alltypes_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="numeric_types_01">
-        <output-file compare="Text">numeric_types_01.adm</output-file>
+        <output-dir compare="Text">numeric_types_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="scan">
       <compilation-unit name="spatial_types_01">
-        <output-file compare="Text">spatial_types_01.adm</output-file>
+        <output-dir compare="Text">spatial_types_01</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="scan">
       <compilation-unit name="spatial_types_02">
-        <output-file compare="Text">spatial_types_02.adm</output-file>
+        <output-dir compare="Text">spatial_types_02</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="scan">
       <compilation-unit name="temp_types_01">
-        <output-file compare="Text">temp_types_01.adm</output-file>
+        <output-dir compare="Text">temp_types_01</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="scan">
       <compilation-unit name="temp_types_02">
-        <output-file compare="Text">temp_types_02.adm</output-file>
+        <output-dir compare="Text">temp_types_02</output-dir>
       </compilation-unit>
     </test-case>
     -->
@@ -2791,1163 +2796,1165 @@
   <test-group name="semistructured">
     <test-case FilePath="semistructured">
       <compilation-unit name="count-nullable">
-        <output-file compare="Text">count-nullable.adm</output-file>
+        <output-dir compare="Text">count-nullable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="semistructured">
       <compilation-unit name="cust-filter">
-        <output-file compare="Text">cust-filter.adm</output-file>
+        <output-dir compare="Text">cust-filter</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="semistructured">
       <compilation-unit name="has-param1">
-        <output-file compare="Text">has-param1.adm</output-file>
+        <output-dir compare="Text">has-param1</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="similarity">
     <test-case FilePath="similarity">
       <compilation-unit name="edit-distance-check_ints">
-        <output-file compare="Text">edit-distance-check_ints.adm</output-file>
+        <output-dir compare="Text">edit-distance-check_ints</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="edit-distance-check_strings">
-        <output-file compare="Text">edit-distance-check_strings.adm</output-file>
+        <output-dir compare="Text">edit-distance-check_strings</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="edit-distance-list-is-filterable">
-        <output-file compare="Text">edit-distance-list-is-filterable.adm</output-file>
+        <output-dir compare="Text">edit-distance-list-is-filterable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="edit-distance-string-is-filterable">
-        <output-file compare="Text">edit-distance-string-is-filterable.adm</output-file>
+        <output-dir compare="Text">edit-distance-string-is-filterable</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="edit-distance_ints">
-        <output-file compare="Text">edit-distance_ints.adm</output-file>
+        <output-dir compare="Text">edit-distance_ints</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="edit-distance_strings">
-        <output-file compare="Text">edit-distance_strings.adm</output-file>
+        <output-dir compare="Text">edit-distance_strings</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="fuzzyeq-edit-distance">
-        <output-file compare="Text">fuzzyeq-edit-distance.adm</output-file>
+        <output-dir compare="Text">fuzzyeq-edit-distance</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="fuzzyeq-similarity-jaccard">
-        <output-file compare="Text">fuzzyeq-similarity-jaccard.adm</output-file>
+        <output-dir compare="Text">fuzzyeq-similarity-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="prefix-len-jaccard">
-        <output-file compare="Text">prefix-len-jaccard.adm</output-file>
+        <output-dir compare="Text">prefix-len-jaccard</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-check_ints">
-        <output-file compare="Text">similarity-jaccard-check_ints.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-check_ints</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-check_query">
-        <output-file compare="Text">similarity-jaccard-check_query.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-check_query</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-check_strings">
-        <output-file compare="Text">similarity-jaccard-check_strings.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-check_strings</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-prefix-check">
-        <output-file compare="Text">similarity-jaccard-prefix-check.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-prefix-check</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-prefix">
-        <output-file compare="Text">similarity-jaccard-prefix.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-prefix</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-sorted-check_ints">
-        <output-file compare="Text">similarity-jaccard-sorted-check_ints.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-sorted-check_ints</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-sorted-check_query">
-        <output-file compare="Text">similarity-jaccard-sorted-check_query.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-sorted-check_query</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-sorted-check_strings">
-        <output-file compare="Text">similarity-jaccard-sorted-check_strings.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-sorted-check_strings</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-sorted_ints">
-        <output-file compare="Text">similarity-jaccard-sorted_ints.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-sorted_ints</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-sorted_query">
-        <output-file compare="Text">similarity-jaccard-sorted_query.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-sorted_query</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard-sorted_strings">
-        <output-file compare="Text">similarity-jaccard-sorted_strings.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard-sorted_strings</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard_ints">
-        <output-file compare="Text">similarity-jaccard_ints.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard_ints</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard_query">
-        <output-file compare="Text">similarity-jaccard_query.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard_query</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="similarity">
       <compilation-unit name="similarity-jaccard_strings">
-        <output-file compare="Text">similarity-jaccard_strings.adm</output-file>
+        <output-dir compare="Text">similarity-jaccard_strings</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="spatial">
     <test-case FilePath="spatial">
       <compilation-unit name="cell-aggregation-with-filtering">
-        <output-file compare="Text">cell-aggregation-with-filtering.adm</output-file>
+        <output-dir compare="Text">cell-aggregation-with-filtering</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="cell-aggregation">
-        <output-file compare="Text">cell-aggregation.adm</output-file>
+        <output-dir compare="Text">cell-aggregation</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="circle_accessor">
-        <output-file compare="Text">circle_accessor.adm</output-file>
+        <output-dir compare="Text">circle_accessor</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="circle-intersect-circle">
-        <output-file compare="Text">circle-intersect-circle.adm</output-file>
+        <output-dir compare="Text">circle-intersect-circle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="create-rtree-index">
-        <output-file compare="Text">create-rtree-index.adm</output-file>
+        <output-dir compare="Text">create-rtree-index</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="distance-between-points">
-        <output-file compare="Text">distance-between-points.adm</output-file>
+        <output-dir compare="Text">distance-between-points</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="line_accessor">
-        <output-file compare="Text">line_accessor.adm</output-file>
+        <output-dir compare="Text">line_accessor</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="line-intersect-circle">
-        <output-file compare="Text">line-intersect-circle.adm</output-file>
+        <output-dir compare="Text">line-intersect-circle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="line-intersect-line">
-        <output-file compare="Text">line-intersect-line.adm</output-file>
+        <output-dir compare="Text">line-intersect-line</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="line-intersect-polygon">
-        <output-file compare="Text">line-intersect-polygon.adm</output-file>
+        <output-dir compare="Text">line-intersect-polygon</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="line-intersect-rectangle">
-        <output-file compare="Text">line-intersect-rectangle.adm</output-file>
+        <output-dir compare="Text">line-intersect-rectangle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="point_accessor">
-        <output-file compare="Text">point_accessor.adm</output-file>
+        <output-dir compare="Text">point_accessor</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="point-equals-point">
-        <output-file compare="Text">point-equals-point.adm</output-file>
+        <output-dir compare="Text">point-equals-point</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="point-in-circle">
-        <output-file compare="Text">point-in-circle.adm</output-file>
+        <output-dir compare="Text">point-in-circle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="point-in-polygon">
-        <output-file compare="Text">point-in-polygon.adm</output-file>
+        <output-dir compare="Text">point-in-polygon</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="point-in-rectangle">
-        <output-file compare="Text">point-in-rectangle.adm</output-file>
+        <output-dir compare="Text">point-in-rectangle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="point-on-line">
-        <output-file compare="Text">point-on-line.adm</output-file>
+        <output-dir compare="Text">point-on-line</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="polygon_accessor">
-        <output-file compare="Text">polygon_accessor.adm</output-file>
+        <output-dir compare="Text">polygon_accessor</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="polygon-intersect-circle">
-        <output-file compare="Text">polygon-intersect-circle.adm</output-file>
+        <output-dir compare="Text">polygon-intersect-circle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="polygon-intersect-polygon">
-        <output-file compare="Text">polygon-intersect-polygon.adm</output-file>
+        <output-dir compare="Text">polygon-intersect-polygon</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="polygon-intersect-rectangle">
-        <output-file compare="Text">polygon-intersect-rectangle.adm</output-file>
+        <output-dir compare="Text">polygon-intersect-rectangle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="rectangle_accessor">
-        <output-file compare="Text">rectangle_accessor.adm</output-file>
+        <output-dir compare="Text">rectangle_accessor</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="rectangle-intersect-circle">
-        <output-file compare="Text">rectangle-intersect-circle.adm</output-file>
+        <output-dir compare="Text">rectangle-intersect-circle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="rectangle-intersect-rectangle">
-        <output-file compare="Text">rectangle-intersect-rectangle.adm</output-file>
+        <output-dir compare="Text">rectangle-intersect-rectangle</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="spatial">
       <compilation-unit name="spatial-area">
-        <output-file compare="Text">spatial-area.adm</output-file>
+        <output-dir compare="Text">spatial-area</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="string">
     <test-case FilePath="string">
       <compilation-unit name="codepoint-to-string1">
-        <output-file compare="Text">codepoint-to-string1.adm</output-file>
+        <output-dir compare="Text">codepoint-to-string1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="codepoint-to-string2">
-        <output-file compare="Text">codepoint-to-string2.adm</output-file>
+        <output-dir compare="Text">codepoint-to-string2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="concat_01">
-        <output-file compare="Text">concat_01.adm</output-file>
+        <output-dir compare="Text">concat_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="concat_02">
-        <output-file compare="Text">concat_02.adm</output-file>
+        <output-dir compare="Text">concat_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="contains_01">
-        <output-file compare="Text">contains_01.adm</output-file>
+        <output-dir compare="Text">contains_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="cpttostr01">
-        <output-file compare="Text">cpttostr01.adm</output-file>
+        <output-dir compare="Text">cpttostr01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="cpttostr02">
-        <output-file compare="Text">cpttostr02.adm</output-file>
+        <output-dir compare="Text">cpttostr02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="cpttostr04">
-        <output-file compare="Text">cpttostr04.adm</output-file>
+        <output-dir compare="Text">cpttostr04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="end-with1">
-        <output-file compare="Text">end-with1.adm</output-file>
+        <output-dir compare="Text">end-with1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="end-with2">
-        <output-file compare="Text">end-with2.adm</output-file>
+        <output-dir compare="Text">end-with2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="end-with3">
-        <output-file compare="Text">end-with3.adm</output-file>
+        <output-dir compare="Text">end-with3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="end-with4">
-        <output-file compare="Text">end-with4.adm</output-file>
+        <output-dir compare="Text">end-with4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="end-with5">
-        <output-file compare="Text">end-with5.adm</output-file>
+        <output-dir compare="Text">end-with5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="ends-with_01">
-        <output-file compare="Text">ends-with_01.adm</output-file>
+        <output-dir compare="Text">ends-with_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="endwith02">
-        <output-file compare="Text">endwith02.adm</output-file>
+        <output-dir compare="Text">endwith02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="endwith03">
-        <output-file compare="Text">endwith03.adm</output-file>
+        <output-dir compare="Text">endwith03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="length_01">
-        <output-file compare="Text">length_01.adm</output-file>
+        <output-dir compare="Text">length_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="length_02">
-        <output-file compare="Text">length_02.adm</output-file>
+        <output-dir compare="Text">length_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="like_01">
-        <output-file compare="Text">like_01.adm</output-file>
+        <output-dir compare="Text">like_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="like_null">
-        <output-file compare="Text">like_null.adm</output-file>
+        <output-dir compare="Text">like_null</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="lowercase">
-        <output-file compare="Text">lowercase.adm</output-file>
+        <output-dir compare="Text">lowercase</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches02">
-        <output-file compare="Text">matches02.adm</output-file>
+        <output-dir compare="Text">matches02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches03">
-        <output-file compare="Text">matches03.adm</output-file>
+        <output-dir compare="Text">matches03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches04">
-        <output-file compare="Text">matches04.adm</output-file>
+        <output-dir compare="Text">matches04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches05">
-        <output-file compare="Text">matches05.adm</output-file>
+        <output-dir compare="Text">matches05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches06">
-        <output-file compare="Text">matches06.adm</output-file>
+        <output-dir compare="Text">matches06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches1">
-        <output-file compare="Text">matches1.adm</output-file>
+        <output-dir compare="Text">matches1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches11">
-        <output-file compare="Text">matches11.adm</output-file>
+        <output-dir compare="Text">matches11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches2">
-        <output-file compare="Text">matches2.adm</output-file>
+        <output-dir compare="Text">matches2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches21">
-        <output-file compare="Text">matches21.adm</output-file>
+        <output-dir compare="Text">matches21</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches22">
-        <output-file compare="Text">matches22.adm</output-file>
+        <output-dir compare="Text">matches22</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches23">
-        <output-file compare="Text">matches23.adm</output-file>
+        <output-dir compare="Text">matches23</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matches3">
-        <output-file compare="Text">matches3.adm</output-file>
+        <output-dir compare="Text">matches3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="matchesnull">
-        <output-file compare="Text">matchesnull.adm</output-file>
+        <output-dir compare="Text">matchesnull</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="replace1">
-        <output-file compare="Text">replace1.adm</output-file>
+        <output-dir compare="Text">replace1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="replace2">
-        <output-file compare="Text">replace2.adm</output-file>
+        <output-dir compare="Text">replace2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="replace21">
-        <output-file compare="Text">replace21.adm</output-file>
+        <output-dir compare="Text">replace21</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="replace22">
-        <output-file compare="Text">replace22.adm</output-file>
+        <output-dir compare="Text">replace22</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="replace3">
-        <output-file compare="Text">replace3.adm</output-file>
+        <output-dir compare="Text">replace3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="start-with1">
-        <output-file compare="Text">start-with1.adm</output-file>
+        <output-dir compare="Text">start-with1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="start-with2">
-        <output-file compare="Text">start-with2.adm</output-file>
+        <output-dir compare="Text">start-with2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="start-with3">
-        <output-file compare="Text">start-with3.adm</output-file>
+        <output-dir compare="Text">start-with3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="start-with4">
-        <output-file compare="Text">start-with4.adm</output-file>
+        <output-dir compare="Text">start-with4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="start-with5">
-        <output-file compare="Text">start-with5.adm</output-file>
+        <output-dir compare="Text">start-with5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="starts-with_01">
-        <output-file compare="Text">starts-with_01.adm</output-file>
+        <output-dir compare="Text">starts-with_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="startwith02">
-        <output-file compare="Text">startwith02.adm</output-file>
+        <output-dir compare="Text">startwith02</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="string">
       <compilation-unit name="startwith03">
-        <output-file compare="Text">startwith03.adm</output-file>
+        <output-dir compare="Text">startwith03</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="string">
       <compilation-unit name="strconcat01">
-        <output-file compare="Text">strconcat01.adm</output-file>
+        <output-dir compare="Text">strconcat01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="strconcat02">
-        <output-file compare="Text">strconcat02.adm</output-file>
+        <output-dir compare="Text">strconcat02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-concat1">
-        <output-file compare="Text">string-concat1.adm</output-file>
+        <output-dir compare="Text">string-concat1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-equal1">
-        <output-file compare="Text">string-equal1.adm</output-file>
+        <output-dir compare="Text">string-equal1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-equal2">
-        <output-file compare="Text">string-equal2.adm</output-file>
+        <output-dir compare="Text">string-equal2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-equal3">
-        <output-file compare="Text">string-equal3.adm</output-file>
+        <output-dir compare="Text">string-equal3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-equal4">
-        <output-file compare="Text">string-equal4.adm</output-file>
+        <output-dir compare="Text">string-equal4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-join1">
-        <output-file compare="Text">string-join1.adm</output-file>
+        <output-dir compare="Text">string-join1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-to-codepoint">
-        <output-file compare="Text">string-to-codepoint.adm</output-file>
+        <output-dir compare="Text">string-to-codepoint</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="string-to-codepoint1">
-        <output-file compare="Text">string-to-codepoint1.adm</output-file>
+        <output-dir compare="Text">string-to-codepoint1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="strlen02">
-        <output-file compare="Text">strlen02.adm</output-file>
+        <output-dir compare="Text">strlen02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="strlen03">
-        <output-file compare="Text">strlen03.adm</output-file>
+        <output-dir compare="Text">strlen03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="strtocpt01">
-        <output-file compare="Text">strtocpt01.adm</output-file>
+        <output-dir compare="Text">strtocpt01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="strtocpt02">
-        <output-file compare="Text">strtocpt02.adm</output-file>
+        <output-dir compare="Text">strtocpt02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="strtocpt03">
-        <output-file compare="Text">strtocpt03.adm</output-file>
+        <output-dir compare="Text">strtocpt03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substr01">
-        <output-file compare="Text">substr01.adm</output-file>
+        <output-dir compare="Text">substr01</output-dir>
       </compilation-unit>
     </test-case>
     <!-- Issue no 219
     <test-case FilePath="string">
       <compilation-unit name="substr04">
-        <output-file compare="Text">substr04.adm</output-file>
+        <output-dir compare="Text">substr04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substr05">
-        <output-file compare="Text">substr05.adm</output-file>
+        <output-dir compare="Text">substr05</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="string">
       <compilation-unit name="substr06">
-        <output-file compare="Text">substr06.adm</output-file>
+        <output-dir compare="Text">substr06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-after-1">
-        <output-file compare="Text">substring-after-1.adm</output-file>
+        <output-dir compare="Text">substring-after-1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-after-2">
-        <output-file compare="Text">substring-after-2.adm</output-file>
+        <output-dir compare="Text">substring-after-2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-after-3">
-        <output-file compare="Text">substring-after-3.adm</output-file>
+        <output-dir compare="Text">substring-after-3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-after-4">
-        <output-file compare="Text">substring-after-4.adm</output-file>
+        <output-dir compare="Text">substring-after-4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-before-1">
-        <output-file compare="Text">substring-before-1.adm</output-file>
+        <output-dir compare="Text">substring-before-1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-before-2">
-        <output-file compare="Text">substring-before-2.adm</output-file>
+        <output-dir compare="Text">substring-before-2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring-before-3">
-        <output-file compare="Text">substring-before-3.adm</output-file>
+        <output-dir compare="Text">substring-before-3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring2-1">
-        <output-file compare="Text">substring2-1.adm</output-file>
+        <output-dir compare="Text">substring2-1</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring2-2">
-        <output-file compare="Text">substring2-2.adm</output-file>
+        <output-dir compare="Text">substring2-2</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring2-3">
-        <output-file compare="Text">substring2-3.adm</output-file>
+        <output-dir compare="Text">substring2-3</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring2-4">
-        <output-file compare="Text">substring2-4.adm</output-file>
+        <output-dir compare="Text">substring2-4</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="substring_01">
-        <output-file compare="Text">substring_01.adm</output-file>
+        <output-dir compare="Text">substring_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="toLowerCase02">
-        <output-file compare="Text">toLowerCase02.adm</output-file>
+        <output-dir compare="Text">toLowerCase02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="toLowerCase03">
-        <output-file compare="Text">toLowerCase03.adm</output-file>
+        <output-dir compare="Text">toLowerCase03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="string">
       <compilation-unit name="toLowerCase04">
-        <output-file compare="Text">toLowerCase04.adm</output-file>
+        <output-dir compare="Text">toLowerCase04</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="subset-collection">
     <test-case FilePath="subset-collection">
       <compilation-unit name="01">
-        <output-file compare="Text">01.adm</output-file>
+        <output-dir compare="Text">01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="subset-collection">
       <compilation-unit name="02">
-        <output-file compare="Text">02.adm</output-file>
+        <output-dir compare="Text">02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="subset-collection">
       <compilation-unit name="03">
-        <output-file compare="Text">03.adm</output-file>
+        <output-dir compare="Text">03</output-dir>
       </compilation-unit>
     </test-case>
     <!--
     <test-case FilePath="subset-collection">
       <compilation-unit name="04">
-        <output-file compare="Text">04.adm</output-file>
+        <output-dir compare="Text">04</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="subset-collection">
       <compilation-unit name="05">
-        <output-file compare="Text">05.adm</output-file>
+        <output-dir compare="Text">05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="subset-collection">
       <compilation-unit name="06">
-        <output-file compare="Text">06.adm</output-file>
+        <output-dir compare="Text">06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="subset-collection">
       <compilation-unit name="07">
-        <output-file compare="Text">07.adm</output-file>
+        <output-dir compare="Text">07</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="tokenizers">
     <test-case FilePath="tokenizers">
       <compilation-unit name="counthashed-gram-tokens_01">
-        <output-file compare="Text">counthashed-gram-tokens_01.adm</output-file>
+        <output-dir compare="Text">counthashed-gram-tokens_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="counthashed-gram-tokens_02">
-        <output-file compare="Text">counthashed-gram-tokens_02.adm</output-file>
+        <output-dir compare="Text">counthashed-gram-tokens_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="counthashed-word-tokens_01">
-        <output-file compare="Text">counthashed-word-tokens_01.adm</output-file>
+        <output-dir compare="Text">counthashed-word-tokens_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="gram-tokens_01">
-        <output-file compare="Text">gram-tokens_01.adm</output-file>
+        <output-dir compare="Text">gram-tokens_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="gram-tokens_02">
-        <output-file compare="Text">gram-tokens_02.adm</output-file>
+        <output-dir compare="Text">gram-tokens_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="hashed-gram-tokens_01">
-        <output-file compare="Text">hashed-gram-tokens_01.adm</output-file>
+        <output-dir compare="Text">hashed-gram-tokens_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="hashed-gram-tokens_02">
-        <output-file compare="Text">hashed-gram-tokens_02.adm</output-file>
+        <output-dir compare="Text">hashed-gram-tokens_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="hashed-word-tokens_01">
-        <output-file compare="Text">hashed-word-tokens_01.adm</output-file>
+        <output-dir compare="Text">hashed-word-tokens_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="word-tokens_01">
-        <output-file compare="Text">word-tokens_01.adm</output-file>
+        <output-dir compare="Text">word-tokens_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tokenizers">
       <compilation-unit name="word-tokens_02">
-        <output-file compare="Text">word-tokens_02.adm</output-file>
+        <output-dir compare="Text">word-tokens_02</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="tpch">
     <test-case FilePath="tpch">
       <compilation-unit name="distinct_by">
-        <output-file compare="Text">distinct_by.adm</output-file>
+        <output-dir compare="Text">distinct_by</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="group_no_agg">
-        <output-file compare="Text">group_no_agg.adm</output-file>
+        <output-dir compare="Text">group_no_agg</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q10_returned_item">
-        <output-file compare="Text">q10_returned_item.adm</output-file>
+        <output-dir compare="Text">q10_returned_item</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q10_returned_item_int64">
-	<output-file compare="Text">q10_returned_item_int64.adm</output-file>
+       <output-dir compare="Text">q10_returned_item_int64</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q11_important_stock">
-        <output-file compare="Text">q11_important_stock.adm</output-file>
+        <output-dir compare="Text">q11_important_stock</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q12_shipping">
-        <output-file compare="Text">q12_shipping.adm</output-file>
+        <output-dir compare="Text">q12_shipping</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q13_customer_distribution">
-        <output-file compare="Text">q13_customer_distribution.adm</output-file>
+        <output-dir compare="Text">q13_customer_distribution</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q14_promotion_effect">
-        <output-file compare="Text">q14_promotion_effect.adm</output-file>
+        <output-dir compare="Text">q14_promotion_effect</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q15_top_supplier">
-        <output-file compare="Text">q15_top_supplier.adm</output-file>
+        <output-dir compare="Text">q15_top_supplier</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q16_parts_supplier_relationship">
-        <output-file compare="Text">q16_parts_supplier_relationship.adm</output-file>
+        <output-dir compare="Text">q16_parts_supplier_relationship</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q17_small_quantity_order_revenue">
-        <output-file compare="Text">q17_small_quantity_order_revenue.adm</output-file>
+        <output-dir compare="Text">q17_small_quantity_order_revenue</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q18_large_volume_customer">
-        <output-file compare="Text">q18_large_volume_customer.adm</output-file>
+        <output-dir compare="Text">q18_large_volume_customer</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q19_discounted_revenue">
-        <output-file compare="Text">q19_discounted_revenue.adm</output-file>
+        <output-dir compare="Text">q19_discounted_revenue</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q1_pricing_summary_report_nt">
-        <output-file compare="Text">q1_pricing_summary_report_nt.adm</output-file>
+        <output-dir compare="Text">q1_pricing_summary_report_nt</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q20_potential_part_promotion">
-        <output-file compare="Text">q20_potential_part_promotion.adm</output-file>
+        <output-dir compare="Text">q20_potential_part_promotion</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q21_suppliers_who_kept_orders_waiting">
-        <output-file compare="Text">q21_suppliers_who_kept_orders_waiting.adm</output-file>
+        <output-dir compare="Text">q21_suppliers_who_kept_orders_waiting</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q22_global_sales_opportunity">
-        <output-file compare="Text">q22_global_sales_opportunity.adm</output-file>
+        <output-dir compare="Text">q22_global_sales_opportunity</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q2_minimum_cost_supplier">
-        <output-file compare="Text">q2_minimum_cost_supplier.adm</output-file>
+        <output-dir compare="Text">q2_minimum_cost_supplier</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q3_shipping_priority_nt">
-        <output-file compare="Text">q3_shipping_priority_nt.adm</output-file>
+        <output-dir compare="Text">q3_shipping_priority_nt</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q4_order_priority">
-        <output-file compare="Text">q4_order_priority.adm</output-file>
+        <output-dir compare="Text">q4_order_priority</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q5_local_supplier_volume">
-        <output-file compare="Text">q5_local_supplier_volume.adm</output-file>
+        <output-dir compare="Text">q5_local_supplier_volume</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q6_forecast_revenue_change">
-        <output-file compare="Text">q6_forecast_revenue_change.adm</output-file>
+        <output-dir compare="Text">q6_forecast_revenue_change</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q7_volume_shipping">
-        <output-file compare="Text">q7_volume_shipping.adm</output-file>
+        <output-dir compare="Text">q7_volume_shipping</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q8_national_market_share">
-        <output-file compare="Text">q8_national_market_share.adm</output-file>
+        <output-dir compare="Text">q8_national_market_share</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="tpch">
       <compilation-unit name="q9_product_type_profit_nt">
-        <output-file compare="Text">q9_product_type_profit_nt.adm</output-file>
+        <output-dir compare="Text">q9_product_type_profit_nt</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="writers">
     <test-case FilePath="writers">
       <compilation-unit name="print_01">
-        <output-file compare="Text">print_01.adm</output-file>
+        <output-dir compare="Text">print_01</output-dir>
       </compilation-unit>
     </test-case>
+<!--  TODO(madhusudancs): Enable this test when REST API supports serialized output support.
     <test-case FilePath="writers">
       <compilation-unit name="serialized_01">
-        <output-file compare="Text">serialized_01.adm</output-file>
+        <output-dir compare="Text">serialized_01</output-dir>
       </compilation-unit>
     </test-case>
+-->
   </test-group>
   <test-group name="cross-dataverse">
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv01">
-        <output-file compare="Text">cross-dv01.adm</output-file>
+        <output-dir compare="Text">cross-dv01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv02">
-        <output-file compare="Text">cross-dv02.adm</output-file>
+        <output-dir compare="Text">cross-dv02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv03">
-        <output-file compare="Text">cross-dv03.adm</output-file>
+        <output-dir compare="Text">cross-dv03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv04">
-        <output-file compare="Text">cross-dv04.adm</output-file>
+        <output-dir compare="Text">cross-dv04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv07">
-        <output-file compare="Text">cross-dv07.adm</output-file>
+        <output-dir compare="Text">cross-dv07</output-dir>
       </compilation-unit>
     </test-case>
     <!--NotImplementedException: No binary comparator factory implemented for type RECORD. 
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv08">
-        <output-file compare="Text">cross-dv08.adm</output-file>
+        <output-dir compare="Text">cross-dv08</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv09">
-        <output-file compare="Text">cross-dv09.adm</output-file>
+        <output-dir compare="Text">cross-dv09</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv11">
-        <output-file compare="Text">cross-dv11.adm</output-file>
+        <output-dir compare="Text">cross-dv11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv12">
-        <output-file compare="Text">cross-dv12.adm</output-file>
+        <output-dir compare="Text">cross-dv12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv13">
-        <output-file compare="Text">cross-dv13.adm</output-file>
+        <output-dir compare="Text">cross-dv13</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv14">
-        <output-file compare="Text">cross-dv14.adm</output-file>
+        <output-dir compare="Text">cross-dv14</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv15">
-        <output-file compare="Text">cross-dv15.adm</output-file>
+        <output-dir compare="Text">cross-dv15</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv16">
-        <output-file compare="Text">cross-dv16.adm</output-file>
+        <output-dir compare="Text">cross-dv16</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
     <!--NotImplementedException: No binary comparator factory implemented for type RECORD. 
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv17">
-        <output-file compare="Text">cross-dv17.adm</output-file>
+        <output-dir compare="Text">cross-dv17</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!--NotImplementedException: No binary comparator factory implemented for type RECORD.
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv18">
-        <output-file compare="Text">cross-dv18.adm</output-file>
+        <output-dir compare="Text">cross-dv18</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv19">
-        <output-file compare="Text">cross-dv19.adm</output-file>
+        <output-dir compare="Text">cross-dv19</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="cross-dv20">
-        <output-file compare="Text">cross-dv20.adm</output-file>
+        <output-dir compare="Text">cross-dv20</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="insert_across_dataverses">
-        <output-file compare="Text">insert_across_dataverses.adm</output-file>
+        <output-dir compare="Text">insert_across_dataverses</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="cross-dataverse">
       <compilation-unit name="join_across_dataverses">
-        <output-file compare="Text">join_across_dataverses.adm</output-file>
+        <output-dir compare="Text">join_across_dataverses</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="user-defined-functions">
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="query-issue201">
-        <output-file compare="Text">query-issue201.adm</output-file>
+        <output-dir compare="Text">query-issue201</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf01">
-        <output-file compare="Text">udf01.adm</output-file>
+        <output-dir compare="Text">udf01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf02">
-        <output-file compare="Text">udf02.adm</output-file>
+        <output-dir compare="Text">udf02</output-dir>
       </compilation-unit>
     </test-case>
     <!-- causes NPE: Issue 200
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf03">
-        <output-file compare="Text">udf03.adm</output-file>
+        <output-dir compare="Text">udf03</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf04">
-        <output-file compare="Text">udf04.adm</output-file>
+        <output-dir compare="Text">udf04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf05">
-        <output-file compare="Text">udf05.adm</output-file>
+        <output-dir compare="Text">udf05</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf06">
-        <output-file compare="Text">udf06.adm</output-file>
+        <output-dir compare="Text">udf06</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf07">
-        <output-file compare="Text">udf07.adm</output-file>
+        <output-dir compare="Text">udf07</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf08">
-        <output-file compare="Text">udf08.adm</output-file>
+        <output-dir compare="Text">udf08</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf09">
-        <output-file compare="Text">udf09.adm</output-file>
+        <output-dir compare="Text">udf09</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf10">
-        <output-file compare="Text">udf10.adm</output-file>
+        <output-dir compare="Text">udf10</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf11">
-        <output-file compare="Text">udf11.adm</output-file>
+        <output-dir compare="Text">udf11</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf12">
-        <output-file compare="Text">udf12.adm</output-file>
+        <output-dir compare="Text">udf12</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf13">
-        <output-file compare="Text">udf13.adm</output-file>
+        <output-dir compare="Text">udf13</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf14">
-        <output-file compare="Text">udf14.adm</output-file>
+        <output-dir compare="Text">udf14</output-dir>
       </compilation-unit>
     </test-case>
     <!-- Issue 166
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf15">
-        <output-file compare="Text">udf15.adm</output-file>
+        <output-dir compare="Text">udf15</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf16">
-        <output-file compare="Text">udf16.adm</output-file>
+        <output-dir compare="Text">udf16</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf17">
-        <output-file compare="Text">udf17.adm</output-file>
+        <output-dir compare="Text">udf17</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf18">
-        <output-file compare="Text">udf18.adm</output-file>
+        <output-dir compare="Text">udf18</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf19">
-        <output-file compare="Text">udf19.adm</output-file>
+        <output-dir compare="Text">udf19</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf20">
-        <output-file compare="Text">udf20.adm</output-file>
+        <output-dir compare="Text">udf20</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf21">
-        <output-file compare="Text">udf21.adm</output-file>
+        <output-dir compare="Text">udf21</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf22">
-        <output-file compare="Text">udf22.adm</output-file>
+        <output-dir compare="Text">udf22</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf23">
-        <output-file compare="Text">udf23.adm</output-file>
+        <output-dir compare="Text">udf23</output-dir>
       </compilation-unit>
     </test-case>
     <!-- Issue 195
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf24">
-        <output-file compare="Text">udf24.adm</output-file>
+        <output-dir compare="Text">udf24</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <!-- Issue 218
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf25">
-        <output-file compare="Text">udf25.adm</output-file>
+        <output-dir compare="Text">udf25</output-dir>
       </compilation-unit>
     </test-case>
     -->
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf26">
-        <output-file compare="Text">udf26.adm</output-file>
+        <output-dir compare="Text">udf26</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="udf27">
-        <output-file compare="Text">udf27.adm</output-file>
+        <output-dir compare="Text">udf27</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="f01">
-        <output-file compare="Text">f01.adm</output-file>
+        <output-dir compare="Text">f01</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error> 
       </compilation-unit>
     </test-case>
@@ -3955,7 +3962,7 @@
   <test-group name="load">
     <test-case FilePath="load">
       <compilation-unit name="issue14_query">
-        <output-file compare="Text">none.adm</output-file>
+        <output-dir compare="Text">none</output-dir>
         <expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error> 
       </compilation-unit>
     </test-case>
@@ -3963,134 +3970,115 @@
   <test-group name="hints">
     <test-case FilePath="hints">
       <compilation-unit name="issue_251_dataset_hint_5">
-        <output-file compare="Text">issue_251_dataset_hint_5.adm</output-file>
+        <output-dir compare="Text">issue_251_dataset_hint_5</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="hints">
       <compilation-unit name="issue_251_dataset_hint_6">
-        <output-file compare="Text">issue_251_dataset_hint_6.adm</output-file>
+        <output-dir compare="Text">issue_251_dataset_hint_6</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="hints">
       <compilation-unit name="issue_251_dataset_hint_7">
-        <output-file compare="Text">issue_251_dataset_hint_7.adm</output-file>
+        <output-dir compare="Text">issue_251_dataset_hint_7</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="feeds">
     <test-case FilePath="feeds">
       <compilation-unit name="feeds_01">
-        <output-file compare="Text">feeds_01.adm</output-file>
+        <output-dir compare="Text">feeds_01</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="feeds">
       <compilation-unit name="feeds_02">
-        <output-file compare="Text">feeds_02.adm</output-file>
+        <output-dir compare="Text">feeds_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="feeds">
       <compilation-unit name="feeds_03">
-        <output-file compare="Text">feeds_03.adm</output-file>
+        <output-dir compare="Text">feeds_03</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="feeds">
       <compilation-unit name="feeds_04">
-        <output-file compare="Text">feeds_04.adm</output-file>
+        <output-dir compare="Text">feeds_04</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="feeds">
       <compilation-unit name="issue_230_feeds">
-        <output-file compare="Text">issue_230_feeds.adm</output-file>
+        <output-dir compare="Text">issue_230_feeds</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
   <test-group name="hdfs">
     <test-case FilePath="hdfs">
       <compilation-unit name="issue_245_hdfs">
-        <output-file compare="Text">issue_245_hdfs.adm</output-file>
+        <output-dir compare="Text">issue_245_hdfs</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="hdfs">
       <compilation-unit name="hdfs_02">
-        <output-file compare="Text">hdfs_02.adm</output-file>
+        <output-dir compare="Text">hdfs_02</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="hdfs">
       <compilation-unit name="hdfs_03">
-        <output-file compare="Text">hdfs_03.adm</output-file>
+        <output-dir compare="Text">hdfs_03</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
     <test-group name="temporal">
   	<test-case FilePath="temporal">
   		<compilation-unit name="accessors">
-        <output-file compare="Text">accessors.adm</output-file>
+        <output-dir compare="Text">accessors</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="temporal">
   		<compilation-unit name="adjust_timezone">
-        <output-file compare="Text">adjust_timezone.adm</output-file>
+        <output-dir compare="Text">adjust_timezone</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="temporal">
   		<compilation-unit name="calendar_duration">
-        <output-file compare="Text">calendar_duration.adm</output-file>
+        <output-dir compare="Text">calendar_duration</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="temporal">
   		<compilation-unit name="date_functions">
-        <output-file compare="Text">date_functions.adm</output-file>
+        <output-dir compare="Text">date_functions</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="temporal">
   		<compilation-unit name="datetime_functions">
-        <output-file compare="Text">datetime_functions.adm</output-file>
+        <output-dir compare="Text">datetime_functions</output-dir>
       </compilation-unit>
   	</test-case>
 <!--   	<test-case FilePath="temporal">
   		<compilation-unit name="insert_from_delimited_ds">
-        <output-file compare="Text">insert_from_delimited_ds.adm</output-file>
+        <output-dir compare="Text">insert_from_delimited_ds</output-dir>
       </compilation-unit>
   	</test-case> -->
   	<test-case FilePath="temporal">
   		<compilation-unit name="insert_from_ext_ds">
-        <output-file compare="Text">insert_from_ext_ds.adm</output-file>
+        <output-dir compare="Text">insert_from_ext_ds</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="temporal">
   		<compilation-unit name="interval_functions">
-        <output-file compare="Text">interval_functions.adm</output-file>
+        <output-dir compare="Text">interval_functions</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="temporal">
   		<compilation-unit name="time_functions">
-        <output-file compare="Text">time_functions.adm</output-file>
+        <output-dir compare="Text">time_functions</output-dir>
       </compilation-unit>
   	</test-case>
   	<test-case FilePath="constructor">
-  		<compilation-unit name="date_01">
-        <output-file compare="Text">date_01.adm</output-file>
-      </compilation-unit>
-  	</test-case>
-  	  	<test-case FilePath="constructor">
-  		<compilation-unit name="time_01">
-        <output-file compare="Text">time_01.adm</output-file>
-      </compilation-unit>
-  	</test-case>
-  	  	<test-case FilePath="constructor">
-  		<compilation-unit name="datetime_01">
-        <output-file compare="Text">datetime_01.adm</output-file>
-      </compilation-unit>
-  	</test-case>
-  	  	  	<test-case FilePath="constructor">
-  		<compilation-unit name="duration_01">
-        <output-file compare="Text">duration_01.adm</output-file>
-      </compilation-unit>
-  	</test-case>
-  	  	<test-case FilePath="constructor">
   		<compilation-unit name="interval">
-        <output-file compare="Text">interval.adm</output-file>
+        <output-dir compare="Text">interval</output-dir>
       </compilation-unit>
   	</test-case>
   </test-group>
-</test-suite>
\ No newline at end of file
+</test-suite>
+