diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
index 8d5546f..ec82988 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
@@ -23,12 +23,11 @@
 import edu.uci.ics.asterix.common.config.GlobalConfig;
 import edu.uci.ics.asterix.common.exceptions.AsterixException;
 import edu.uci.ics.asterix.test.aql.TestsUtils;
-import edu.uci.ics.asterix.test.runtime.RuntimeTest;
 
 @RunWith(Parameterized.class)
 public class MetadataTest {
 
-    private static final Logger LOGGER = Logger.getLogger(RuntimeTest.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(MetadataTest.class.getName());
 
     private static final PrintWriter ERR = new PrintWriter(System.err);
     private static final String EXTENSION_QUERY = "aql";
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
index 13d65d5..d35001e 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
@@ -90,27 +90,23 @@
 
     @Test
     public void test() throws Exception {
-        if (System.getProperty("run_new_tests") != null) {
-            List<CompilationUnit> cUnits = tcCtx.getTestCase().getCompilationUnit();
-            for (CompilationUnit cUnit : cUnits) {
-                File testFile = tcCtx.getTestFile(cUnit);
-                File expectedResultFile = tcCtx.getExpectedResultFile(cUnit);
-                File actualFile = new File(PATH_ACTUAL + File.separator
-                        + tcCtx.getTestCase().getFilePath().replace(File.separator, "_") + "_" + cUnit.getName()
-                        + ".adm");
+        List<CompilationUnit> cUnits = tcCtx.getTestCase().getCompilationUnit();
+        for (CompilationUnit cUnit : cUnits) {
+            File testFile = tcCtx.getTestFile(cUnit);
+            File expectedResultFile = tcCtx.getExpectedResultFile(cUnit);
+            File actualFile = new File(PATH_ACTUAL + File.separator
+                    + tcCtx.getTestCase().getFilePath().replace(File.separator, "_") + "_" + cUnit.getName() + ".adm");
 
-                File actualResultFile = tcCtx.getActualResultFile(cUnit, new File(PATH_ACTUAL));
-                actualResultFile.getParentFile().mkdirs();
-                try {
-                    TestsUtils.runScriptAndCompareWithResult(
-                            AsterixHyracksIntegrationUtil.getHyracksClientConnection(), testFile, new PrintWriter(
-                                    System.err), expectedResultFile, actualFile);
-                } catch (Exception e) {
-                    LOGGER.severe("Test \"" + testFile + "\" FAILED!");
-                    e.printStackTrace();
-                    if (cUnit.getExpectedError().isEmpty()) {
-                        throw new Exception("Test \"" + testFile + "\" FAILED!", e);
-                    }
+            File actualResultFile = tcCtx.getActualResultFile(cUnit, new File(PATH_ACTUAL));
+            actualResultFile.getParentFile().mkdirs();
+            try {
+                TestsUtils.runScriptAndCompareWithResult(AsterixHyracksIntegrationUtil.getHyracksClientConnection(),
+                        testFile, new PrintWriter(System.err), expectedResultFile, actualFile);
+            } catch (Exception e) {
+                LOGGER.severe("Test \"" + testFile + "\" FAILED!");
+                e.printStackTrace();
+                if (cUnit.getExpectedError().isEmpty()) {
+                    throw new Exception("Test \"" + testFile + "\" FAILED!", e);
                 }
             }
         }
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java
deleted file mode 100644
index b7877a3..0000000
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package edu.uci.ics.asterix.test.runtime;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.logging.Logger;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import edu.uci.ics.asterix.api.common.AsterixHyracksIntegrationUtil;
-import edu.uci.ics.asterix.common.config.GlobalConfig;
-import edu.uci.ics.asterix.test.aql.TestsUtils;
-import edu.uci.ics.asterix.test.common.TestHelper;
-
-@RunWith(Parameterized.class)
-public class RuntimeTest {
-
-    private static final PrintWriter ERR = new PrintWriter(System.err);
-    private static final String EXTENSION_QUERY = "aql";
-    private static final String FILENAME_IGNORE = "ignore.txt";
-    private static final String FILENAME_ONLY = "only.txt";
-    private static final ArrayList<String> ignore = readFile(FILENAME_IGNORE);
-    private static final ArrayList<String> only = readFile(FILENAME_ONLY);
-    private static final String PATH_ACTUAL = "rttest/";
-    private static final String PATH_BASE = "src/test/resources/runtimets/";
-    private static final String PATH_EXPECTED = PATH_BASE + "results/";
-    private static final String PATH_QUERIES = PATH_BASE + "queries/";
-    private static final String SEPARATOR = System.getProperty("file.separator");
-
-    private static final String TEST_CONFIG_FILE_NAME = "test.properties";
-    private static final String[] ASTERIX_DATA_DIRS = new String[] { "nc1data", "nc2data" };
-
-    private static final Logger LOGGER = Logger.getLogger(RuntimeTest.class.getName());
-
-    // private static NCBootstrapImpl _bootstrap = new NCBootstrapImpl();
-
-    private static ArrayList<String> readFile(String fileName) {
-        ArrayList<String> list = new ArrayList<String>();
-        BufferedReader result;
-        try {
-            result = new BufferedReader(new InputStreamReader(new FileInputStream(PATH_BASE + fileName), "UTF-8"));
-            while (true) {
-                String line = result.readLine();
-                if (line == null) {
-                    break;
-                } else {
-                    String s = line.trim();
-                    if (s.length() > 0) {
-                        list.add(s);
-                    }
-                }
-            }
-            result.close();
-        } catch (FileNotFoundException e) {
-        } catch (IOException e) {
-        }
-        return list;
-    }
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY, TEST_CONFIG_FILE_NAME);
-        System.setProperty(GlobalConfig.WEB_SERVER_PORT_PROPERTY, "19002");
-        File outdir = new File(PATH_ACTUAL);
-        outdir.mkdirs();
-
-        File log = new File("asterix_logs");
-        if (log.exists())
-            FileUtils.deleteDirectory(log);
-        File lsn = new File("last_checkpoint_lsn");
-        lsn.deleteOnExit();
-
-        AsterixHyracksIntegrationUtil.init();
-
-	// TODO: Uncomment when hadoop version is upgraded and adapters are ported
-        //HDFSCluster.getInstance().setup();
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        AsterixHyracksIntegrationUtil.deinit();
-        File outdir = new File(PATH_ACTUAL);
-        File[] files = outdir.listFiles();
-        if (files == null || files.length == 0) {
-            outdir.delete();
-        }
-        // clean up the files written by the ASTERIX storage manager
-        for (String d : ASTERIX_DATA_DIRS) {
-            TestsUtils.deleteRec(new File(d));
-        }
-
-        File log = new File("asterix_logs");
-        if (log.exists())
-            FileUtils.deleteDirectory(log);
-        File lsn = new File("last_checkpoint_lsn");
-        lsn.deleteOnExit();
-        
-	// TODO: Uncomment when hadoop version is upgraded and adapters are ported
-        //HDFSCluster.getInstance().cleanup();
-    }
-
-    private static void suiteBuild(File dir, Collection<Object[]> testArgs, String path) {
-        for (File file : dir.listFiles()) {
-            if (file.isDirectory() && !file.getName().startsWith(".")) {
-                suiteBuild(file, testArgs, path + file.getName() + SEPARATOR);
-            }
-            if (file.isFile() && file.getName().endsWith(EXTENSION_QUERY)
-            // && !ignore.contains(path + file.getName())
-            ) {
-                String resultFileName = TestsUtils.aqlExtToResExt(file.getName());
-                File expectedFile = new File(PATH_EXPECTED + path + resultFileName);
-                File actualFile = new File(PATH_ACTUAL + SEPARATOR + path.replace(SEPARATOR, "_") + resultFileName);
-                testArgs.add(new Object[] { file, expectedFile, actualFile });
-            }
-        }
-    }
-
-    @Parameters
-    public static Collection<Object[]> tests() {
-        Collection<Object[]> testArgs = new ArrayList<Object[]>();
-        suiteBuild(new File(PATH_QUERIES), testArgs, "");
-        return testArgs;
-    }
-
-    private File actualFile;
-    private File expectedFile;
-    private File queryFile;
-
-    public RuntimeTest(File queryFile, File expectedFile, File actualFile) {
-        this.queryFile = queryFile;
-        this.expectedFile = expectedFile;
-        this.actualFile = actualFile;
-    }
-
-    @Test
-    public void test() throws Exception {
-        try {
-            String queryFileShort = queryFile.getPath().substring(PATH_QUERIES.length())
-                    .replace(SEPARATOR.charAt(0), '/');
-
-            if (!only.isEmpty()) {
-                Assume.assumeTrue(TestHelper.isInPrefixList(only, queryFileShort));
-            }
-            Assume.assumeTrue(!TestHelper.isInPrefixList(ignore, queryFileShort));
-            System.out.println("RUNNING TEST: " + queryFile + " \n");
-            LOGGER.severe("RUNNING TEST: " + queryFile + " \n");
-            TestsUtils.runScriptAndCompareWithResult(AsterixHyracksIntegrationUtil.getHyracksClientConnection(),
-                    queryFile, ERR, expectedFile, actualFile);
-        } catch (Exception e) {
-            if (!(e instanceof AssumptionViolatedException)) {
-                LOGGER.severe("Test \"" + queryFile.getPath() + "\" FAILED!");
-                e.printStackTrace();
-                throw new Exception("Test \"" + queryFile.getPath() + "\" FAILED!", e);
-            } else {
-                throw e;
-            }
-        }
-    }
-
-}
diff --git a/asterix-app/src/test/resources/runtimets/ignore.txt b/asterix-app/src/test/resources/runtimets/ignore.txt
deleted file mode 100644
index 2b011ec..0000000
--- a/asterix-app/src/test/resources/runtimets/ignore.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-custord/join_q_04.aql
-scan/spatial_types_02.aql
-scan/temp_types_02.aql
-fuzzyjoin/dblp-splits-3_1.aql
-fuzzyjoin/events-users-aqlplus_1.aql
-subset-collection/04.aql
-custord/freq-clerk.aql
-custord/denorm-cust-order_01.aql
-custord/denorm-cust-order_03.aql
-custord/co.aql
-comparison/numeric-comparison_01.aql
-dapd/q3.aql
-failure/q1_pricing_summary_report_failure.aql
-dml/load-from-hdfs.aql
-open-closed/open-closed-15
-open-closed/open-closed-16
-open-closed/open-closed-17
-open-closed/open-closed-18
-open-closed/open-closed-19
-open-closed/open-closed-20
-open-closed/open-closed-21
-open-closed/open-closed-22
-open-closed/open-closed-28
-open-closed/open-closed-30
-open-closed/heterog-list02
-open-closed/heterog-list03
-open-closed/c2c
-quantifiers/somesat_03.aql
-quantifiers/somesat_04.aql
-quantifiers/somesat_05.aql
-quantifiers/everysat_02.aql
-quantifiers/everysat_03.aql
-flwor
-string/startwith03.aql
-aggregate/droptype.aql
diff --git a/asterix-app/src/test/resources/runtimets/only.txt b/asterix-app/src/test/resources/runtimets/only.txt
deleted file mode 100644
index e69de29..0000000
--- a/asterix-app/src/test/resources/runtimets/only.txt
+++ /dev/null
diff --git a/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterix-app/src/test/resources/runtimets/testsuite.xml
index 44e4edf..aa4e257 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -90,11 +90,13 @@
         <output-file compare="Text">count_null.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="aggregate">
       <compilation-unit name="droptype">
         <output-file compare="Text">droptype.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="aggregate">
       <compilation-unit name="global-avg_01">
         <output-file compare="Text">global-avg_01.adm</output-file>
@@ -474,11 +476,13 @@
         <output-file compare="Text">neq_01.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="comparison">
       <compilation-unit name="numeric-comparison_01">
         <output-file compare="Text">numeric-comparison_01.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="comparison">
       <compilation-unit name="string">
         <output-file compare="Text">string.adm</output-file>
@@ -583,11 +587,13 @@
     </test-case>
   </test-group>
   <test-group name="custord">
+    <!--
     <test-case FilePath="custord">
       <compilation-unit name="co">
         <output-file compare="Text">co.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="custord">
       <compilation-unit name="customer_q_01">
         <output-file compare="Text">customer_q_01.adm</output-file>
@@ -628,26 +634,32 @@
         <output-file compare="Text">customer_q_08.adm</output-file>
       </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>
       </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>
       </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>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="custord">
       <compilation-unit name="freq-clerk">
         <output-file compare="Text">freq-clerk.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="custord">
       <compilation-unit name="join_q_01">
         <output-file compare="Text">join_q_01.adm</output-file>
@@ -663,11 +675,13 @@
         <output-file compare="Text">join_q_03.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="custord">
       <compilation-unit name="join_q_04">
         <output-file compare="Text">join_q_04.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="custord">
       <compilation-unit name="load-test">
         <output-file compare="Text">load-test.adm</output-file>
@@ -715,11 +729,13 @@
         <output-file compare="Text">q2.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="dapd">
       <compilation-unit name="q3">
         <output-file compare="Text">q3.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
   </test-group>
   <test-group name="dml">
     <test-case FilePath="dml">
@@ -792,11 +808,13 @@
         <output-file compare="Text">insert_less_nc.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="dml">
       <compilation-unit name="load-from-hdfs">
         <output-file compare="Text">load-from-hdfs.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="dml">
       <compilation-unit name="load-with-index">
         <output-file compare="Text">load-with-index.adm</output-file>
@@ -911,12 +929,15 @@
         <output-file compare="Text">insert.adm</output-file>
       </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>
       </compilation-unit>
     </test-case>
+    -->
   </test-group>
+  <!--
   <test-group name="flwor">
     <test-case FilePath="flwor">
       <compilation-unit name="for01">
@@ -1339,6 +1360,7 @@
       </compilation-unit>
     </test-case>
   </test-group>
+  -->
   <test-group name="fuzzyjoin">
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-1_1">
@@ -1360,16 +1382,13 @@
         <output-file compare="Text">dblp-1_2.adm</output-file>
       </compilation-unit>
     </test-case>
+   <!--
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2">
         <output-file compare="Text">dblp-2.adm</output-file>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="fuzzyjoin">
-      <compilation-unit name="dblp-2">
-        <output-file compare="Text">dblp-2.adm</output-file>
-      </compilation-unit>
-    </test-case>
+    -->
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="dblp-2_1">
         <output-file compare="Text">dblp-2_1.adm</output-file>
@@ -1560,16 +1579,20 @@
         <output-file compare="Text">dblp-lookup_1.adm</output-file>
       </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>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="events-users-aqlplus_1">
         <output-file compare="Text">events-users-aqlplus_1.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="fuzzyjoin">
       <compilation-unit name="user-int-aqlplus_1">
         <output-file compare="Text">user-int-aqlplus_1.adm</output-file>
@@ -2249,21 +2272,27 @@
     </test-case>
   </test-group>
   <test-group name="open-closed">
+    <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="c2c-w-optional">
         <output-file compare="Text">c2c-w-optional.adm</output-file>
       </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>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="c2c">
         <output-file compare="Text">c2c.adm</output-file>
       </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>
@@ -2274,16 +2303,20 @@
         <output-file compare="Text">heterog-list01.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="heterog-list02">
         <output-file compare="Text">heterog-list02.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="open-closed">
       <compilation-unit name="heterog-list03">
         <output-file compare="Text">heterog-list03.adm</output-file>
       </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>
@@ -2299,41 +2332,55 @@
         <output-file compare="Text">open-closed-14.adm</output-file>
       </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>
       </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>
       </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>
       </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>
       </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>
       </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>
       </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>
       </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>
@@ -2349,21 +2396,25 @@
         <output-file compare="Text">open-closed-26.adm</output-file>
       </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>
       </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>
       </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>
       </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>
@@ -2386,16 +2437,20 @@
         <output-file compare="Text">everysat_01.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_02">
         <output-file compare="Text">everysat_02.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_03">
         <output-file compare="Text">everysat_03.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="quantifiers">
       <compilation-unit name="everysat_04">
         <output-file compare="Text">everysat_04.adm</output-file>
@@ -2411,21 +2466,27 @@
         <output-file compare="Text">somesat_02.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_03">
         <output-file compare="Text">somesat_03.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_04">
         <output-file compare="Text">somesat_04.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
+    <!--
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_05">
         <output-file compare="Text">somesat_05.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="quantifiers">
       <compilation-unit name="somesat_06">
         <output-file compare="Text">somesat_06.adm</output-file>
@@ -2500,21 +2561,25 @@
         <output-file compare="Text">spatial_types_01.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="scan">
       <compilation-unit name="spatial_types_02">
         <output-file compare="Text">spatial_types_02.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="scan">
       <compilation-unit name="temp_types_01">
         <output-file compare="Text">temp_types_01.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="scan">
       <compilation-unit name="temp_types_02">
         <output-file compare="Text">temp_types_02.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
   </test-group>
   <test-group name="semistructured">
     <test-case FilePath="semistructured">
@@ -2978,11 +3043,13 @@
         <output-file compare="Text">startwith02.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="string">
       <compilation-unit name="startwith03">
         <output-file compare="Text">startwith03.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="string">
       <compilation-unit name="strconcat01">
         <output-file compare="Text">strconcat01.adm</output-file>
@@ -3170,11 +3237,13 @@
         <output-file compare="Text">03.adm</output-file>
       </compilation-unit>
     </test-case>
+    <!--
     <test-case FilePath="subset-collection">
       <compilation-unit name="04">
         <output-file compare="Text">04.adm</output-file>
       </compilation-unit>
     </test-case>
+    -->
     <test-case FilePath="subset-collection">
       <compilation-unit name="05">
         <output-file compare="Text">05.adm</output-file>