diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java
index aa1f17b..fcaa67b 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java
@@ -19,6 +19,7 @@
 package org.apache.asterix.bad.test;
 
 import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil;
+import org.apache.hyracks.test.support.TestUtils;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -26,31 +27,14 @@
 public class BADAsterixHyracksIntegrationUtil extends AsterixHyracksIntegrationUtil {
 
     public static void main(String[] args) throws Exception {
+        TestUtils.redirectLoggingToConsole();
         BADAsterixHyracksIntegrationUtil integrationUtil = new BADAsterixHyracksIntegrationUtil();
         try {
-            integrationUtil.run(Boolean.getBoolean("cleanup.start"), Boolean.getBoolean("cleanup.shutdown"),
-                    System.getProperty("external.lib", ""));
+            integrationUtil.run(true, Boolean.getBoolean("cleanup.shutdown"),
+                    System.getProperty("external.lib", "asterixdb/asterix-opt/asterix-bad/src/main/resources/cc.conf"));
         } catch (Exception e) {
+            e.printStackTrace();
             System.exit(1);
         }
     }
-
-    @Override
-    protected void run(boolean cleanupOnStart, boolean cleanupOnShutdown, String loadExternalLibs) throws Exception {
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                try {
-                    deinit(cleanupOnShutdown);
-                } catch (Exception e) {
-
-                }
-            }
-        });
-        init(cleanupOnStart, "asterixdb/asterix-opt/asterix-bad/src/main/resources/cc.conf");
-        while (true) {
-            Thread.sleep(10000);
-        }
-    }
-
 }
diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
index f88a327..3153907 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
@@ -23,7 +23,6 @@
 import java.util.Collection;
 import java.util.logging.Logger;
 
-import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil;
 import org.apache.asterix.common.config.TransactionProperties;
 import org.apache.asterix.test.common.TestExecutor;
 import org.apache.asterix.test.runtime.ExecutionTestUtil;
@@ -56,6 +55,8 @@
     private static final TestExecutor testExecutor = new TestExecutor();
     private static final boolean cleanupOnStart = true;
     private static final boolean cleanupOnStop = true;
+    private static final String TEST_SUITE_FILE = "testsuite_bad.xml";
+    private static final String ONLY_SUITE_FILE = "only_bad.xml";
 
     protected static TestGroup FailedGroup;
     protected TestLsmBtreeLocalResource resource = null;
@@ -64,7 +65,7 @@
     public static void setUp() throws Exception {
         File outdir = new File(PATH_ACTUAL);
         outdir.mkdirs();
-        ExecutionTestUtil.setUp(cleanupOnStart, TEST_CONFIG_FILE_NAME, new AsterixHyracksIntegrationUtil(), false,
+        ExecutionTestUtil.setUp(cleanupOnStart, TEST_CONFIG_FILE_NAME, new BADAsterixHyracksIntegrationUtil(), false,
                 null);
     }
 
@@ -76,7 +77,11 @@
 
     @Parameters(name = "BADExecutionTest {index}: {0}")
     public static Collection<Object[]> tests() throws Exception {
-        return buildTestsInXml("testsuite.xml");
+        Collection<Object[]> test_cases = buildTestsInXml(ONLY_SUITE_FILE);
+        if (test_cases.size() == 0) {
+            test_cases = buildTestsInXml(TEST_SUITE_FILE);
+        }
+        return test_cases;
     }
 
     protected static Collection<Object[]> buildTestsInXml(String xmlfile) throws Exception {
diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADListenerTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADListenerTest.java
index 09dc38c..8c6fa75 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADListenerTest.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADListenerTest.java
@@ -68,7 +68,7 @@
     @BeforeClass
     public static void init() {
         djsel = new DeployedJobSpecEventListener(null,
-                new EntityId(BADConstants.CHANNEL_EXTENSION_NAME, DataverseName.createSinglePartName("test"), "test"),
+                new EntityId(BADConstants.RUNTIME_ENTITY_CHANNEL, DataverseName.createSinglePartName("test"), "test"),
                 DeployedJobSpecEventListener.PrecompiledType.CHANNEL);
     }
 
diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADMetadataTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADMetadataTest.java
new file mode 100644
index 0000000..3448331
--- /dev/null
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADMetadataTest.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.bad.test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil;
+import org.apache.asterix.test.common.TestExecutor;
+import org.apache.asterix.testframework.context.TestCaseContext;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Executes the Metadata tests.
+ */
+@RunWith(Parameterized.class)
+public class BADMetadataTest {
+
+    private TestCaseContext tcCtx;
+
+    private static final String PATH_ACTUAL = "target" + File.separator + "mdtest" + File.separator;
+    private static final String PATH_BASE =
+            StringUtils.join(new String[] { "src", "test", "resources", "metadata" + File.separator }, File.separator);
+    protected static final String TEST_CONFIG_FILE_NAME = "src/main/resources/cc.conf";
+
+    private static final TestExecutor testExecutor = new TestExecutor();
+    private static AsterixHyracksIntegrationUtil integrationUtil = new AsterixHyracksIntegrationUtil();
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        File outdir = new File(PATH_ACTUAL);
+        outdir.mkdirs();
+        integrationUtil.init(true, TEST_CONFIG_FILE_NAME);
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        integrationUtil.deinit(true);
+        File outdir = new File(PATH_ACTUAL);
+        File[] files = outdir.listFiles();
+        if (files == null || files.length == 0) {
+            outdir.delete();
+        }
+    }
+
+    @Parameters(name = "MetadataTest {index}: {0}")
+    public static Collection<Object[]> tests() throws Exception {
+        Collection<Object[]> testArgs = new ArrayList<Object[]>();
+        TestCaseContext.Builder b = new TestCaseContext.Builder();
+        for (TestCaseContext ctx : b.build(new File(PATH_BASE))) {
+            testArgs.add(new Object[] { ctx });
+        }
+        return testArgs;
+    }
+
+    public BADMetadataTest(TestCaseContext tcCtx) {
+        this.tcCtx = tcCtx;
+    }
+
+    @Test
+    public void test() throws Exception {
+        testExecutor.executeTest(PATH_ACTUAL, tcCtx, null, false);
+    }
+
+}
diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java
index 6c409a1..16602be 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java
@@ -39,9 +39,9 @@
     public static void setUp() throws Exception {
         final File outdir = new File(PATH_ACTUAL);
         outdir.mkdirs();
-
         extensionLangCompilationProvider = new BADCompilationProvider();
         statementExecutorFactory = new BADQueryTranslatorFactory();
+        integrationUtil = new BADAsterixHyracksIntegrationUtil();
 
         integrationUtil.init(true, TEST_CONFIG_FILE_NAME);
         // Set the node resolver to be the identity resolver that expects node names
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.1.ddl.sqlpp
similarity index 68%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.1.ddl.sqlpp
index b1a132b..6f47dd1 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.1.ddl.sqlpp
@@ -16,12 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+
+CREATE TYPE School AS OPEN {
+  sid: bigint,
+  area_code: string,
+  name: string
+};
+CREATE DATASET Schools(School) PRIMARY KEY sid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.2.update.sqlpp
similarity index 74%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.2.update.sqlpp
index b1a132b..39eef7a 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.2.update.sqlpp
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE FEED TweetFeed WITH {
+  "adapter-name" : "localfs",
+  "path" : "asterix_nc1:///Users/xikuiw/Projects/NotBAD/tweets_publisher/output/tweets.txt",
+  "type-name":"Tweet",
+  "format" : "adm",
+  "insert-feed" : true
+};
+
+CONNECT FEED TweetFeed TO DATASET Tweets;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.3.update.sqlpp
similarity index 76%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.3.update.sqlpp
index b1a132b..b9f8643 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.3.update.sqlpp
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE CONTINUOUS CHANNEL TweetsWithSchools(code) PERIOD duration("PT3S")
+{
+  SELECT t
+  FROM Tweets t WHERE area_code = t.area_code  AND current_channel_time(t) > current_datetime()
+};
+
+CREATE BROKER brokerA AT "http://127.0.0.1:10100";
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.4.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.4.query.sqlpp
index b7bb951..04917e0 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/continuous_channel/continuous_channel.4.query.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+SELECT VALUE d FROM Metadata.`Dataset` d WHERE d.DataverseName = "test";
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_active_datasets/create_active_datasets.1.ddl.sqlpp
similarity index 72%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/create_active_datasets/create_active_datasets.1.ddl.sqlpp
index b1a132b..2fc3783 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_active_datasets/create_active_datasets.1.ddl.sqlpp
@@ -16,12 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+DROP DATASET Tweets IF EXISTS;
+DROP TYPE Tweet IF EXISTS;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_active_datasets/create_active_datasets.2.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/create_active_datasets/create_active_datasets.2.query.sqlpp
index b7bb951..81589bd 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_active_datasets/create_active_datasets.2.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT VALUE d FROM Metadata.`Dataset` d WHERE d.DatasetName = "Tweets";
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_broker/create_bad_broker.1.ddl.sqlpp
similarity index 79%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_broker/create_bad_broker.1.ddl.sqlpp
index b1a132b..5a6ba82 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_broker/create_bad_broker.1.ddl.sqlpp
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+drop dataverse test if exists;
+create dataverse test;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE BROKER brokerA AT "http://127.0.0.1:10100" with {
+  "broker-type" : "BAD"
+};
+
+CREATE BROKER brokerB AT "http://127.0.0.1:10100";
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_broker/create_bad_broker.2.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_broker/create_bad_broker.2.query.sqlpp
index b7bb951..549c59c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_broker/create_bad_broker.2.query.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+SELECT * FROM Metadata.`Broker`;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_feed/create_bad_feed.1.ddl.sqlpp
similarity index 60%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_feed/create_bad_feed.1.ddl.sqlpp
index b1a132b..0e7495d 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_feed/create_bad_feed.1.ddl.sqlpp
@@ -16,12 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+drop dataverse test if exists;
+create dataverse test;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE TYPE LocalThreateningTweet AS {
+  channelExecutionEpochTime: bigint,
+  dataverseName: string,
+  channelName: string
+};
+
+CREATE FEED LocalThreateningTweetFeed WITH {
+  "adapter-name" : "http_adapter",
+  "addresses" : "127.0.0.1:10013",
+  "address-type" : "IP",
+  "type-name" : "LocalThreateningTweet",
+  "format" : "ADM",
+  "bad-host" : "127.0.0.1",
+  "bad-channel" : "ThreateningTweetsAt",
+  "bad-channel-parameters": "OC",
+  "bad-dataverse": "test"
+};
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_feed/create_bad_feed.2.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_feed/create_bad_feed.2.query.sqlpp
index b7bb951..d29e4d2 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/metadata/queries/bad_cq/create_bad_feed/create_bad_feed.2.query.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+SELECT * FROM Metadata.`Feed`;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/metadata/results/bad_cq/continuous_channel/continuous_channel.1.adm b/asterix-bad/src/test/resources/metadata/results/bad_cq/continuous_channel/continuous_channel.1.adm
new file mode 100644
index 0000000..ba2bf9a
--- /dev/null
+++ b/asterix-bad/src/test/resources/metadata/results/bad_cq/continuous_channel/continuous_channel.1.adm
@@ -0,0 +1,4 @@
+{ "DataverseName": "test", "DatasetName": "Schools", "DatatypeDataverseName": "test", "DatatypeName": "School", "DatasetType": "INTERNAL", "GroupName": "test.Schools", "CompactionPolicy": "concurrent", "CompactionPolicyProperties": [ { "Name": "max-component-count", "Value": "30" }, { "Name": "min-merge-component-count", "Value": "3" }, { "Name": "max-merge-component-count", "Value": "10" }, { "Name": "size-ratio", "Value": "1.2" } ], "InternalDetails": { "FileStructure": "BTREE", "PartitioningStrategy": "HASH", "PartitioningKey": [ [ "sid" ] ], "PrimaryKey": [ [ "sid" ] ], "Autogenerated": false }, "Hints": {{  }}, "Timestamp": "Wed May 27 19:01:09 PDT 2020", "DatasetId": 102, "PendingOp": 0, "BlockLevelStorageCompression": { "DatasetCompressionScheme": "snappy" } }
+{ "DataverseName": "test", "DatasetName": "Tweets", "DatatypeDataverseName": "test", "DatatypeName": "Tweet", "DatasetType": "INTERNAL", "GroupName": "test.Tweets", "CompactionPolicy": "concurrent", "CompactionPolicyProperties": [ { "Name": "max-component-count", "Value": "30" }, { "Name": "min-merge-component-count", "Value": "3" }, { "Name": "max-merge-component-count", "Value": "10" }, { "Name": "size-ratio", "Value": "1.2" } ], "InternalDetails": { "FileStructure": "BTREE", "PartitioningStrategy": "HASH", "PartitioningKey": [ [ "tid" ] ], "PrimaryKey": [ [ "tid" ] ], "Autogenerated": false }, "Hints": {{  }}, "Timestamp": "Wed May 27 19:01:09 PDT 2020", "DatasetId": 101, "PendingOp": 0, "MetatypeDataverseName": "Metadata", "MetatypeName": "ActiveRecordType", "BlockLevelStorageCompression": { "DatasetCompressionScheme": "snappy" } }
+{ "DataverseName": "test", "DatasetName": "TweetsWithSchoolsResults", "DatatypeDataverseName": "Metadata", "DatatypeName": "ChannelResultsType", "DatasetType": "INTERNAL", "GroupName": "test.TweetsWithSchoolsResults", "CompactionPolicy": "concurrent", "CompactionPolicyProperties": [ { "Name": "max-component-count", "Value": "30" }, { "Name": "min-merge-component-count", "Value": "3" }, { "Name": "max-merge-component-count", "Value": "10" }, { "Name": "size-ratio", "Value": "1.2" } ], "InternalDetails": { "FileStructure": "BTREE", "PartitioningStrategy": "HASH", "PartitioningKey": [ [ "resultId" ] ], "PrimaryKey": [ [ "resultId" ] ], "Autogenerated": true }, "Hints": {{  }}, "Timestamp": "Wed May 27 19:01:09 PDT 2020", "DatasetId": 104, "PendingOp": 0, "BlockLevelStorageCompression": { "DatasetCompressionScheme": "snappy" } }
+{ "DataverseName": "test", "DatasetName": "TweetsWithSchoolsSubscriptions", "DatatypeDataverseName": "Metadata", "DatatypeName": "ChannelSubscriptionsType", "DatasetType": "INTERNAL", "GroupName": "test.TweetsWithSchoolsSubscriptions", "CompactionPolicy": "concurrent", "CompactionPolicyProperties": [ { "Name": "max-component-count", "Value": "30" }, { "Name": "min-merge-component-count", "Value": "3" }, { "Name": "max-merge-component-count", "Value": "10" }, { "Name": "size-ratio", "Value": "1.2" } ], "InternalDetails": { "FileStructure": "BTREE", "PartitioningStrategy": "HASH", "PartitioningKey": [ [ "subscriptionId" ] ], "PrimaryKey": [ [ "subscriptionId" ] ], "Autogenerated": true }, "Hints": {{  }}, "Timestamp": "Wed May 27 19:01:09 PDT 2020", "DatasetId": 103, "PendingOp": 0, "BlockLevelStorageCompression": { "DatasetCompressionScheme": "snappy" } }
diff --git a/asterix-bad/src/test/resources/metadata/results/bad_cq/create_active_datasets/create_active_datasets.1.adm b/asterix-bad/src/test/resources/metadata/results/bad_cq/create_active_datasets/create_active_datasets.1.adm
new file mode 100644
index 0000000..da2fdfb
--- /dev/null
+++ b/asterix-bad/src/test/resources/metadata/results/bad_cq/create_active_datasets/create_active_datasets.1.adm
@@ -0,0 +1 @@
+{ "DataverseName": "test", "DatasetName": "Tweets", "DatatypeDataverseName": "test", "DatatypeName": "Tweet", "DatasetType": "INTERNAL", "GroupName": "test.Tweets", "CompactionPolicy": "concurrent", "CompactionPolicyProperties": [ { "Name": "max-component-count", "Value": "30" }, { "Name": "min-merge-component-count", "Value": "3" }, { "Name": "max-merge-component-count", "Value": "10" }, { "Name": "size-ratio", "Value": "1.2" } ], "InternalDetails": { "FileStructure": "BTREE", "PartitioningStrategy": "HASH", "PartitioningKey": [ [ "tid" ] ], "PrimaryKey": [ [ "tid" ] ], "Autogenerated": false }, "Hints": {{  }}, "Timestamp": "Mon Aug 17 10:23:56 PDT 2020", "DatasetId": 101, "PendingOp": 0, "MetatypeDataverseName": "Metadata", "MetatypeName": "ActiveRecordType", "BlockLevelStorageCompression": { "DatasetCompressionScheme": "snappy" } }
diff --git a/asterix-bad/src/test/resources/metadata/results/bad_cq/create_bad_broker/create_bad_broker.1.adm b/asterix-bad/src/test/resources/metadata/results/bad_cq/create_bad_broker/create_bad_broker.1.adm
new file mode 100644
index 0000000..d939759
--- /dev/null
+++ b/asterix-bad/src/test/resources/metadata/results/bad_cq/create_bad_broker/create_bad_broker.1.adm
@@ -0,0 +1,2 @@
+{ "Broker": { "DataverseName": "test", "BrokerName": "brokerA", "BrokerEndPoint": "http://127.0.0.1:10100", "BrokerType": "bad" } }
+{ "Broker": { "DataverseName": "test", "BrokerName": "brokerB", "BrokerEndPoint": "http://127.0.0.1:10100", "BrokerType": "general" } }
diff --git a/asterix-bad/src/test/resources/metadata/results/bad_cq/create_bad_feed/create_bad_feed.1.adm b/asterix-bad/src/test/resources/metadata/results/bad_cq/create_bad_feed/create_bad_feed.1.adm
new file mode 100644
index 0000000..f498a0d
--- /dev/null
+++ b/asterix-bad/src/test/resources/metadata/results/bad_cq/create_bad_feed/create_bad_feed.1.adm
@@ -0,0 +1 @@
+{ "Feed": { "DataverseName": "test", "FeedName": "LocalThreateningTweetFeed", "AdapterConfiguration": {{ { "Name": "addresses", "Value": "127.0.0.1:10013" }, { "Name": "reader", "Value": "http_adapter" }, { "Name": "bad-channel", "Value": "ThreateningTweetsAt" }, { "Name": "format", "Value": "adm" }, { "Name": "bad-dataverse", "Value": "test" }, { "Name": "type-name", "Value": "LocalThreateningTweet" }, { "Name": "bad-host", "Value": "127.0.0.1" }, { "Name": "feed", "Value": "LocalThreateningTweetFeed" }, { "Name": "address-type", "Value": "IP" }, { "Name": "adapter-name", "Value": "http_adapter" }, { "Name": "is-feed", "Value": "true" }, { "Name": "parser", "Value": "adm" }, { "Name": "bad-channel-parameters", "Value": "OC" }, { "Name": "dataverse", "Value": "test" } }}, "Timestamp": "Mon Aug 17 10:35:46 PDT 2020" } }
diff --git a/asterix-bad/src/test/resources/metadata/testsuite.xml b/asterix-bad/src/test/resources/metadata/testsuite.xml
new file mode 100644
index 0000000..e12cd7b
--- /dev/null
+++ b/asterix-bad/src/test/resources/metadata/testsuite.xml
@@ -0,0 +1,43 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<test-suite  xmlns="urn:xml.testframework.asterix.apache.org"
+             ResultOffsetPath="results"
+             QueryOffsetPath="queries"
+             QueryFileExtension=".sqlpp">
+  <test-group name="bad_cq">
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="create_active_datasets">
+        <output-dir compare="Text">create_active_datasets</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="create_bad_broker">
+        <output-dir compare="Text">create_bad_broker</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="create_bad_feed">
+        <output-dir compare="Text">create_bad_feed</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="continuous_channel">
+        <output-dir compare="Text">continuous_channel</output-dir>
+      </compilation-unit>
+    </test-case>
+  </test-group>
+</test-suite>
diff --git a/asterix-bad/src/test/resources/optimizerts/ignore.txt b/asterix-bad/src/test/resources/optimizerts/ignore.txt
new file mode 100644
index 0000000..fe95886
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/ignore.txt
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
diff --git a/asterix-bad/src/test/resources/optimizerts/only.txt b/asterix-bad/src/test/resources/optimizerts/only.txt
new file mode 100644
index 0000000..5fb2552
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/only.txt
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/cq_udf_test.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/cq_udf_test.sqlpp
new file mode 100644
index 0000000..7a6ac4d
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/cq_udf_test.sqlpp
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE TYPE OfficerLocation AS {
+  oid: int,
+  location: point,
+  vehicle: string
+};
+
+CREATE DATASET Tweets(Tweet) PRIMARY KEY tid;
+CREATE DATASET OfficerLocations(OfficerLocation) PRIMARY KEY oid;
+
+CREATE INDEX s_location ON Tweets(location) type RTREE;
+CREATE INDEX o_location ON OfficerLocations(location) type RTREE;
+
+CREATE FUNCTION NearbyTweets(oid)
+{
+ SELECT t FROM Tweets t, OfficerLocations o
+ WHERE spatial_intersect(create_circle(t.location, 100.0), o.location) AND o.oid = oid
+  AND t.hateful_flag = true
+};
+
+NearbyTweets("01");
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_nearby_tweets.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_nearby_tweets.sqlpp
new file mode 100644
index 0000000..4405542
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_nearby_tweets.sqlpp
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE TYPE OfficerLocation AS {
+  oid: int,
+  location: point,
+  vehicle: string
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+CREATE ACTIVE DATASET OfficerLocations(OfficerLocation) PRIMARY KEY oid;
+
+CREATE INDEX s_location ON Tweets(location) type RTREE;
+CREATE INDEX o_location ON OfficerLocations(location) type RTREE;
+
+write output to nc1:"rttest/unseen_nearby_tweets.sqlpp";
+set `compiler.indexonly` "false";
+
+CREATE CONTINUOUS CHANNEL NearbyTweets(oid) PERIOD duration("PT3S")
+{
+ SELECT t FROM Tweets t, OfficerLocations o
+ WHERE spatial_intersect(create_circle(t.location, 100.0), o.location) AND o.oid = oid AND is_new(t)
+  AND t.hateful_flag = true
+};
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_tweets.sqlpp
similarity index 63%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_tweets.sqlpp
index b1a132b..2c677c6 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_tweets.sqlpp
@@ -16,12 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+
+write output to nc1:"rttest/new_tweets.sqlpp";
+set `compiler.indexonly` "false";
+
+CREATE CONTINUOUS CHANNEL NearbyTweets(oid) PERIOD duration("PT3S")
+{
+ SELECT t FROM Tweets t WHERE is_new(t) AND t.hateful_flag = true
+};
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_tweets_push.sqlpp
similarity index 63%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_tweets_push.sqlpp
index b1a132b..2c677c6 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/new_tweets_push.sqlpp
@@ -16,12 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+
+write output to nc1:"rttest/new_tweets.sqlpp";
+set `compiler.indexonly` "false";
+
+CREATE CONTINUOUS CHANNEL NearbyTweets(oid) PERIOD duration("PT3S")
+{
+ SELECT t FROM Tweets t WHERE is_new(t) AND t.hateful_flag = true
+};
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/threatening_event_near.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/threatening_event_near.sqlpp
new file mode 100644
index 0000000..58ab664
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/threatening_event_near.sqlpp
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE ocpd IF EXISTS;
+CREATE DATAVERSE ocpd;
+USE ocpd;
+CREATE TYPE LocalThreateningTweet AS {
+  nid: uuid
+};
+
+CREATE ACTIVE DATASET LocalThreateningTweets(LocalThreateningTweet) PRIMARY KEY nid autogenerated;
+
+CREATE TYPE OfficerLocation AS {
+  oid: bigint,
+  location: point
+};
+
+CREATE ACTIVE DATASET OfficerLocations(OfficerLocation) PRIMARY KEY oid;
+
+USE ocpd;
+SELECT threateningTweet.result
+  FROM LocalThreateningTweets tn
+  UNNEST tn.results threateningTweet
+  WHERE 1 = (SELECT VALUE o.oid FROM OfficerLocations o ORDER BY spatial_distance(o.location, create_point(threateningTweet.result.location[0], threateningTweet.result.location[1])) ASC)[0];
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/unseen_nearby_tweets.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/unseen_nearby_tweets.sqlpp
new file mode 100644
index 0000000..3a8af7b
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/queries/bad_cq/unseen_nearby_tweets.sqlpp
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE TYPE OfficerLocation AS {
+  oid: int,
+  location: point,
+  vehicle: string
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+CREATE ACTIVE DATASET OfficerLocations(OfficerLocation) PRIMARY KEY oid;
+
+write output to nc1:"rttest/unseen_nearby_tweets.sqlpp";
+set `compiler.indexonly` "false";
+
+CREATE CONTINUOUS CHANNEL NearbyTweets(oid) PERIOD duration("PT3S")
+{
+ SELECT t FROM Tweets t, OfficerLocations o
+     WHERE spatial_intersect(create_circle(t.location, 100.0), o.location) AND o.oid = oid AND (is_new(t) OR is_new(o))
+      AND t.hateful_flag = true
+};
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-advanced-index-only.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-advanced-index-only.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/optimizerts/queries/channel/channel-advanced-index-only.sqlpp
rename to asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-advanced-index-only.sqlpp
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-advanced.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-advanced.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/optimizerts/queries/channel/channel-advanced.sqlpp
rename to asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-advanced.sqlpp
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-create.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp
rename to asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-create.sqlpp
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-push.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-push.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/optimizerts/queries/channel/channel-push.sqlpp
rename to asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-push.sqlpp
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-subscribe.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp
rename to asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-subscribe.sqlpp
diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-unsubscribe.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp
rename to asterix-bad/src/test/resources/optimizerts/queries/bad_rq/channel-unsubscribe.sqlpp
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_cq/cq_udf_test.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/cq_udf_test.plan
new file mode 100644
index 0000000..388e356
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/cq_udf_test.plan
@@ -0,0 +1,24 @@
+-- DISTRIBUTE_RESULT  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- STREAM_PROJECT  |PARTITIONED|
+      -- ASSIGN  |PARTITIONED|
+        -- STREAM_PROJECT  |PARTITIONED|
+          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+            -- NESTED_LOOP  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- STREAM_SELECT  |PARTITIONED|
+                  -- ASSIGN  |PARTITIONED|
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                        -- DATASOURCE_SCAN  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+              -- BROADCAST_EXCHANGE  |PARTITIONED|
+                -- STREAM_PROJECT  |PARTITIONED|
+                  -- ASSIGN  |PARTITIONED|
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      -- STREAM_SELECT  |PARTITIONED|
+                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                          -- DATASOURCE_SCAN  |PARTITIONED|
+                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_nearby_tweets.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_nearby_tweets.plan
new file mode 100644
index 0000000..e4c1ec7
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_nearby_tweets.plan
@@ -0,0 +1,78 @@
+-- NOTIFY_BROKERS  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$120, $$121, $$channelExecutionTime]  |PARTITIONED|
+            {
+              -- AGGREGATE  |LOCAL|
+                -- NESTED_TUPLE_SOURCE  |LOCAL|
+            }
+      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+        -- STABLE_SORT [$$120(ASC), $$121(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$120, $$121, $$channelExecutionTime]  |PARTITIONED|
+            -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- STABLE_SORT [$$97(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$97]  |PARTITIONED|
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      -- COMMIT  |PARTITIONED|
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- INDEX_INSERT_DELETE  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    -- INSERT_DELETE  |PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$92]  |PARTITIONED|
+                                        -- ASSIGN  |PARTITIONED|
+                                          -- STREAM_PROJECT  |PARTITIONED|
+                                            -- ASSIGN  |PARTITIONED|
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                -- ASSIGN  |PARTITIONED|
+                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- HYBRID_HASH_JOIN [$$109][$$102]  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$109]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$106, $$104][$$98, $$99]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$106, $$104]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                                -- ASSIGN  |UNPARTITIONED|
+                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$98, $$99]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$102]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- NESTED_LOOP  |PARTITIONED|
+                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- STREAM_SELECT  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
+                                                                            -- ASSIGN  |PARTITIONED|
+                                                                              -- ASSIGN  |PARTITIONED|
+                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  -- ASSIGN  |PARTITIONED|
+                                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                    -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_tweets.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_tweets.plan
new file mode 100644
index 0000000..ebf5624
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_tweets.plan
@@ -0,0 +1,66 @@
+-- NOTIFY_BROKERS  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$93, $$94, $$channelExecutionTime]  |PARTITIONED|
+            {
+              -- AGGREGATE  |LOCAL|
+                -- NESTED_TUPLE_SOURCE  |LOCAL|
+            }
+      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+        -- STABLE_SORT [$$93(ASC), $$94(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$93, $$94, $$channelExecutionTime]  |PARTITIONED|
+            -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- STABLE_SORT [$$79(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$79]  |PARTITIONED|
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      -- COMMIT  |PARTITIONED|
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- INDEX_INSERT_DELETE  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    -- INSERT_DELETE  |PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$74]  |PARTITIONED|
+                                        -- ASSIGN  |PARTITIONED|
+                                          -- STREAM_PROJECT  |PARTITIONED|
+                                            -- ASSIGN  |PARTITIONED|
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                -- ASSIGN  |PARTITIONED|
+                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                        -- NESTED_LOOP  |PARTITIONED|
+                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                -- HYBRID_HASH_JOIN [$$86, $$84][$$80, $$81]  |PARTITIONED|
+                                                                  -- HASH_PARTITION_EXCHANGE [$$86, $$84]  |PARTITIONED|
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                              -- ASSIGN  |UNPARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                  -- HASH_PARTITION_EXCHANGE [$$80, $$81]  |PARTITIONED|
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                          -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              -- ASSIGN  |PARTITIONED|
+                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                  -- STREAM_SELECT  |PARTITIONED|
+                                                                    -- ASSIGN  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
+                                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_tweets_push.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_tweets_push.plan
new file mode 100644
index 0000000..ebf5624
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/new_tweets_push.plan
@@ -0,0 +1,66 @@
+-- NOTIFY_BROKERS  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$93, $$94, $$channelExecutionTime]  |PARTITIONED|
+            {
+              -- AGGREGATE  |LOCAL|
+                -- NESTED_TUPLE_SOURCE  |LOCAL|
+            }
+      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+        -- STABLE_SORT [$$93(ASC), $$94(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$93, $$94, $$channelExecutionTime]  |PARTITIONED|
+            -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- STABLE_SORT [$$79(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$79]  |PARTITIONED|
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      -- COMMIT  |PARTITIONED|
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- INDEX_INSERT_DELETE  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    -- INSERT_DELETE  |PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$74]  |PARTITIONED|
+                                        -- ASSIGN  |PARTITIONED|
+                                          -- STREAM_PROJECT  |PARTITIONED|
+                                            -- ASSIGN  |PARTITIONED|
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                -- ASSIGN  |PARTITIONED|
+                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                        -- NESTED_LOOP  |PARTITIONED|
+                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                -- HYBRID_HASH_JOIN [$$86, $$84][$$80, $$81]  |PARTITIONED|
+                                                                  -- HASH_PARTITION_EXCHANGE [$$86, $$84]  |PARTITIONED|
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                              -- ASSIGN  |UNPARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                  -- HASH_PARTITION_EXCHANGE [$$80, $$81]  |PARTITIONED|
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                          -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              -- ASSIGN  |PARTITIONED|
+                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                  -- STREAM_SELECT  |PARTITIONED|
+                                                                    -- ASSIGN  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
+                                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_cq/threatening_event_near.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/threatening_event_near.plan
new file mode 100644
index 0000000..3696f5b
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/threatening_event_near.plan
@@ -0,0 +1,111 @@
+-- DISTRIBUTE_RESULT  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- STREAM_PROJECT  |PARTITIONED|
+      -- ASSIGN  |PARTITIONED|
+        -- STREAM_PROJECT  |PARTITIONED|
+          -- STREAM_SELECT  |PARTITIONED|
+            -- STREAM_PROJECT  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- PRE_CLUSTERED_GROUP_BY[$$59]  |PARTITIONED|
+                        {
+                          -- AGGREGATE  |LOCAL|
+                            -- STREAM_SELECT  |LOCAL|
+                              -- NESTED_TUPLE_SOURCE  |LOCAL|
+                        }
+                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                    -- STABLE_SORT [$$59(ASC), $$48(ASC)]  |PARTITIONED|
+                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- HYBRID_HASH_JOIN [$$59][$$60]  |PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$59]  |PARTITIONED|
+                                -- ASSIGN  |PARTITIONED|
+                                  -- STREAM_PROJECT  |PARTITIONED|
+                                    -- ASSIGN  |PARTITIONED|
+                                      -- STREAM_PROJECT  |PARTITIONED|
+                                        -- ASSIGN  |PARTITIONED|
+                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                            -- REPLICATE  |PARTITIONED|
+                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                  -- UNNEST  |PARTITIONED|
+                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                      -- ASSIGN  |PARTITIONED|
+                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$60]  |PARTITIONED|
+                                -- ASSIGN  |PARTITIONED|
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    -- STABLE_SORT [$$60(ASC), $$48(ASC)]  |PARTITIONED|
+                                      -- RANGE_PARTITION_EXCHANGE [$$60(ASC), $$48(ASC)]  |PARTITIONED|
+                                        -- FORWARD  |PARTITIONED|
+                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                            -- REPLICATE  |PARTITIONED|
+                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                  -- ASSIGN  |PARTITIONED|
+                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                      -- NESTED_LOOP  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- ASSIGN  |PARTITIONED|
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              -- ASSIGN  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- REPLICATE  |PARTITIONED|
+                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- UNNEST  |PARTITIONED|
+                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                            -- ASSIGN  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            -- ASSIGN  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                          -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                            -- AGGREGATE  |UNPARTITIONED|
+                                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
+                                                -- AGGREGATE  |PARTITIONED|
+                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                      -- REPLICATE  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            -- ASSIGN  |PARTITIONED|
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                -- NESTED_LOOP  |PARTITIONED|
+                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                    -- ASSIGN  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- REPLICATE  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  -- UNNEST  |PARTITIONED|
+                                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                                      -- ASSIGN  |PARTITIONED|
+                                                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                  -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_cq/unseen_nearby_tweets.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/unseen_nearby_tweets.plan
new file mode 100644
index 0000000..5bf7f10
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_cq/unseen_nearby_tweets.plan
@@ -0,0 +1,80 @@
+-- NOTIFY_BROKERS  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$125, $$126, $$channelExecutionTime]  |PARTITIONED|
+            {
+              -- AGGREGATE  |LOCAL|
+                -- NESTED_TUPLE_SOURCE  |LOCAL|
+            }
+      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+        -- STABLE_SORT [$$125(ASC), $$126(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$125, $$126, $$channelExecutionTime]  |PARTITIONED|
+            -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- STABLE_SORT [$$99(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$99]  |PARTITIONED|
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      -- COMMIT  |PARTITIONED|
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- INDEX_INSERT_DELETE  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    -- INSERT_DELETE  |PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$94]  |PARTITIONED|
+                                        -- ASSIGN  |PARTITIONED|
+                                          -- STREAM_PROJECT  |PARTITIONED|
+                                            -- ASSIGN  |PARTITIONED|
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                -- ASSIGN  |PARTITIONED|
+                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- HYBRID_HASH_JOIN [$$111][$$104]  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$111]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$108, $$106][$$100, $$101]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$108, $$106]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                                -- ASSIGN  |UNPARTITIONED|
+                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$100, $$101]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$104]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- NESTED_LOOP  |PARTITIONED|
+                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                      -- STREAM_SELECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
+                                                                            -- ASSIGN  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- ASSIGN  |PARTITIONED|
+                                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                    -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
+                                                                            -- ASSIGN  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- ASSIGN  |PARTITIONED|
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-advanced-index-only.plan
similarity index 66%
rename from asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
rename to asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-advanced-index-only.plan
index 8786d79..4134a0a 100644
--- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-advanced-index-only.plan
@@ -1,13 +1,13 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$150, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$150, $$151, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$150(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$150, $$channelExecutionTime]  |PARTITIONED|
+        -- STABLE_SORT [$$150(ASC), $$151(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$150, $$151, $$channelExecutionTime]  |PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STABLE_SORT [$$125(ASC)]  |PARTITIONED|
@@ -30,101 +30,100 @@
                                                   -- STREAM_PROJECT  |PARTITIONED|
                                                     -- ASSIGN  |PARTITIONED|
                                                       -- STREAM_PROJECT  |PARTITIONED|
-                                                        -- STREAM_SELECT  |PARTITIONED|
-                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                              -- HYBRID_HASH_JOIN [$$135][$$134]  |PARTITIONED|
-                                                                -- HASH_PARTITION_EXCHANGE [$$135]  |PARTITIONED|
-                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- HYBRID_HASH_JOIN [$$135][$$134]  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$135]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$132, $$130][$$126, $$127]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$132, $$130]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                                -- ASSIGN  |UNPARTITIONED|
+                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$126, $$127]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$128][$$144]  |PARTITIONED|
                                                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- HYBRID_HASH_JOIN [$$133, $$131][$$126, $$127]  |PARTITIONED|
-                                                                        -- HASH_PARTITION_EXCHANGE [$$133, $$131]  |PARTITIONED|
-                                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                                            -- ASSIGN  |PARTITIONED|
-                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
-                                                                                  -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                                                                    -- ASSIGN  |UNPARTITIONED|
-                                                                                      -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                        -- HASH_PARTITION_EXCHANGE [$$126, $$127]  |PARTITIONED|
-                                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                                            -- ASSIGN  |PARTITIONED|
-                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
-                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
-                                                                  -- STREAM_PROJECT  |PARTITIONED|
-                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- HYBRID_HASH_JOIN [$$128][$$144]  |PARTITIONED|
-                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                          -- STREAM_SELECT  |PARTITIONED|
-                                                                            -- ASSIGN  |PARTITIONED|
-                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                -- BTREE_SEARCH  |PARTITIONED|
-                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                    -- STABLE_SORT [$$154(ASC)]  |PARTITIONED|
-                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                        -- STREAM_PROJECT  |PARTITIONED|
-                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                            -- BTREE_SEARCH  |PARTITIONED|
-                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                -- ASSIGN  |PARTITIONED|
-                                                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                        -- HASH_PARTITION_EXCHANGE [$$144]  |PARTITIONED|
-                                                                          -- NESTED_LOOP  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- STREAM_SELECT  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
                                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                              -- UNION_ALL  |PARTITIONED|
+                                                                              -- BTREE_SEARCH  |PARTITIONED|
                                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                  -- STREAM_PROJECT  |PARTITIONED|
-                                                                                    -- STREAM_SELECT  |PARTITIONED|
-                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                        -- BTREE_SEARCH  |PARTITIONED|
-                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                            -- SPLIT  |PARTITIONED|
-                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                -- STREAM_PROJECT  |PARTITIONED|
-                                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                    -- BTREE_SEARCH  |PARTITIONED|
-                                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                        -- ASSIGN  |PARTITIONED|
-                                                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  -- STABLE_SORT [$$155(ASC)]  |PARTITIONED|
                                                                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                      -- SPLIT  |PARTITIONED|
-                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                              -- BTREE_SEARCH  |PARTITIONED|
-                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                  -- ASSIGN  |PARTITIONED|
-                                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                                                              -- UNION_ALL  |PARTITIONED|
-                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                  -- STREAM_PROJECT  |PARTITIONED|
-                                                                                    -- STREAM_SELECT  |PARTITIONED|
                                                                                       -- STREAM_PROJECT  |PARTITIONED|
                                                                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                           -- BTREE_SEARCH  |PARTITIONED|
                                                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                              -- SPLIT  |PARTITIONED|
-                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                  -- STREAM_PROJECT  |PARTITIONED|
-                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                      -- BTREE_SEARCH  |PARTITIONED|
-                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                          -- ASSIGN  |PARTITIONED|
-                                                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                                              -- ASSIGN  |PARTITIONED|
+                                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$144]  |PARTITIONED|
+                                                                      -- NESTED_LOOP  |PARTITIONED|
+                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                          -- UNION_ALL  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- STREAM_SELECT  |PARTITIONED|
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    -- BTREE_SEARCH  |PARTITIONED|
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        -- SPLIT  |PARTITIONED|
+                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                -- BTREE_SEARCH  |PARTITIONED|
+                                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                    -- ASSIGN  |PARTITIONED|
+                                                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
                                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                  -- SPLIT  |PARTITIONED|
+                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                          -- BTREE_SEARCH  |PARTITIONED|
+                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                              -- ASSIGN  |PARTITIONED|
+                                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                          -- UNION_ALL  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- STREAM_SELECT  |PARTITIONED|
                                                                                   -- STREAM_PROJECT  |PARTITIONED|
                                                                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                      -- SPLIT  |PARTITIONED|
+                                                                                      -- BTREE_SEARCH  |PARTITIONED|
                                                                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                                          -- SPLIT  |PARTITIONED|
                                                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                              -- BTREE_SEARCH  |PARTITIONED|
+                                                                                              -- STREAM_PROJECT  |PARTITIONED|
                                                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                  -- ASSIGN  |PARTITIONED|
-                                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                                                  -- BTREE_SEARCH  |PARTITIONED|
+                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                      -- ASSIGN  |PARTITIONED|
+                                                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                  -- SPLIT  |PARTITIONED|
+                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                          -- BTREE_SEARCH  |PARTITIONED|
+                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                              -- ASSIGN  |PARTITIONED|
+                                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-advanced.plan
similarity index 67%
rename from asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
rename to asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-advanced.plan
index fc49ea9..18946c6 100644
--- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-advanced.plan
@@ -1,13 +1,13 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$150, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$150, $$151, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$150(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$150, $$channelExecutionTime]  |PARTITIONED|
+        -- STABLE_SORT [$$150(ASC), $$151(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$150, $$151, $$channelExecutionTime]  |PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STABLE_SORT [$$125(ASC)]  |PARTITIONED|
@@ -30,40 +30,55 @@
                                                   -- STREAM_PROJECT  |PARTITIONED|
                                                     -- ASSIGN  |PARTITIONED|
                                                       -- STREAM_PROJECT  |PARTITIONED|
-                                                        -- STREAM_SELECT  |PARTITIONED|
-                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                              -- HYBRID_HASH_JOIN [$$135][$$134]  |PARTITIONED|
-                                                                -- HASH_PARTITION_EXCHANGE [$$135]  |PARTITIONED|
-                                                                  -- STREAM_PROJECT  |PARTITIONED|
-                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- HYBRID_HASH_JOIN [$$133, $$131][$$126, $$127]  |PARTITIONED|
-                                                                        -- HASH_PARTITION_EXCHANGE [$$133, $$131]  |PARTITIONED|
-                                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                                            -- ASSIGN  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- HYBRID_HASH_JOIN [$$135][$$134]  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$135]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$132, $$130][$$126, $$127]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$132, $$130]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                                -- ASSIGN  |UNPARTITIONED|
+                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$126, $$127]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            -- DATASOURCE_SCAN  |PARTITIONED|
                                                                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
-                                                                                  -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                                                                    -- ASSIGN  |UNPARTITIONED|
-                                                                                      -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                        -- HASH_PARTITION_EXCHANGE [$$126, $$127]  |PARTITIONED|
-                                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                                            -- ASSIGN  |PARTITIONED|
-                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
-                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
-                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                            -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
+                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$128][$$144]  |PARTITIONED|
                                                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- HYBRID_HASH_JOIN [$$128][$$144]  |PARTITIONED|
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        -- STREAM_SELECT  |PARTITIONED|
+                                                                          -- ASSIGN  |PARTITIONED|
+                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                              -- BTREE_SEARCH  |PARTITIONED|
+                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                  -- STABLE_SORT [$$155(ASC)]  |PARTITIONED|
+                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                          -- BTREE_SEARCH  |PARTITIONED|
+                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                              -- ASSIGN  |PARTITIONED|
+                                                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$144]  |PARTITIONED|
+                                                                      -- NESTED_LOOP  |PARTITIONED|
                                                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                          -- STREAM_SELECT  |PARTITIONED|
-                                                                            -- ASSIGN  |PARTITIONED|
+                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                            -- STREAM_SELECT  |PARTITIONED|
                                                                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                 -- BTREE_SEARCH  |PARTITIONED|
                                                                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                    -- STABLE_SORT [$$154(ASC)]  |PARTITIONED|
+                                                                                    -- STABLE_SORT [$$159(ASC)]  |PARTITIONED|
                                                                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                         -- STREAM_PROJECT  |PARTITIONED|
                                                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -71,34 +86,18 @@
                                                                                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                                 -- ASSIGN  |PARTITIONED|
                                                                                                   -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                        -- HASH_PARTITION_EXCHANGE [$$144]  |PARTITIONED|
-                                                                          -- NESTED_LOOP  |PARTITIONED|
-                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                            -- STREAM_SELECT  |PARTITIONED|
                                                                               -- STREAM_PROJECT  |PARTITIONED|
-                                                                                -- STREAM_SELECT  |PARTITIONED|
-                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                    -- BTREE_SEARCH  |PARTITIONED|
-                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                        -- STABLE_SORT [$$158(ASC)]  |PARTITIONED|
-                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                            -- STREAM_PROJECT  |PARTITIONED|
-                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                -- BTREE_SEARCH  |PARTITIONED|
-                                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                    -- ASSIGN  |PARTITIONED|
-                                                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                                                              -- STREAM_PROJECT  |PARTITIONED|
-                                                                                -- STREAM_SELECT  |PARTITIONED|
-                                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                  -- BTREE_SEARCH  |PARTITIONED|
                                                                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                      -- BTREE_SEARCH  |PARTITIONED|
+                                                                                      -- STABLE_SORT [$$162(ASC)]  |PARTITIONED|
                                                                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                          -- STABLE_SORT [$$161(ASC)]  |PARTITIONED|
+                                                                                          -- STREAM_PROJECT  |PARTITIONED|
                                                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                              -- BTREE_SEARCH  |PARTITIONED|
                                                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                  -- BTREE_SEARCH  |PARTITIONED|
-                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                                                      -- ASSIGN  |PARTITIONED|
-                                                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                                                  -- ASSIGN  |PARTITIONED|
+                                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-create.plan
similarity index 92%
rename from asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
rename to asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-create.plan
index 78c599a..c8dc3ef 100644
--- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-create.plan
@@ -1,13 +1,13 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$100, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$100, $$101, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$100(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$100, $$channelExecutionTime]  |PARTITIONED|
+        -- STABLE_SORT [$$100(ASC), $$101(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$100, $$101, $$channelExecutionTime]  |PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STABLE_SORT [$$85(ASC)]  |PARTITIONED|
@@ -35,8 +35,8 @@
                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- STREAM_PROJECT  |PARTITIONED|
                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                  -- HYBRID_HASH_JOIN [$$92, $$90][$$86, $$87]  |PARTITIONED|
-                                                                    -- HASH_PARTITION_EXCHANGE [$$92, $$90]  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$91, $$89][$$86, $$87]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$91, $$89]  |PARTITIONED|
                                                                       -- STREAM_PROJECT  |PARTITIONED|
                                                                         -- ASSIGN  |PARTITIONED|
                                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-push.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-push.plan
new file mode 100644
index 0000000..36d6517
--- /dev/null
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-push.plan
@@ -0,0 +1,92 @@
+-- NOTIFY_BROKERS  |PARTITIONED|
+  -- STREAM_PROJECT  |PARTITIONED|
+    -- STREAM_PROJECT  |PARTITIONED|
+      -- ASSIGN  |PARTITIONED|
+        -- STREAM_PROJECT  |PARTITIONED|
+          -- STREAM_SELECT  |PARTITIONED|
+            -- STREAM_PROJECT  |PARTITIONED|
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$138][$$145]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$138]  |PARTITIONED|
+                    -- NESTED_LOOP  |PARTITIONED|
+                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                            -- HYBRID_HASH_JOIN [$$135, $$133][$$126, $$127]  |PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$135, $$133]  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- ASSIGN  |PARTITIONED|
+                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                      -- DATASOURCE_SCAN  |PARTITIONED|
+                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                          -- ASSIGN  |UNPARTITIONED|
+                                            -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$126, $$127]  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- ASSIGN  |PARTITIONED|
+                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                      -- DATASOURCE_SCAN  |PARTITIONED|
+                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                      -- BROADCAST_EXCHANGE  |PARTITIONED|
+                        -- STREAM_SELECT  |PARTITIONED|
+                          -- ASSIGN  |PARTITIONED|
+                            -- STREAM_PROJECT  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                    -- PRE_CLUSTERED_GROUP_BY[$$178]  |PARTITIONED|
+                            {
+                              -- AGGREGATE  |LOCAL|
+                                -- STREAM_SELECT  |LOCAL|
+                                  -- NESTED_TUPLE_SOURCE  |LOCAL|
+                            }
+                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                        -- STABLE_SORT [$$178(ASC)]  |PARTITIONED|
+                          -- HASH_PARTITION_EXCHANGE [$$178]  |PARTITIONED|
+                            -- UNION_ALL  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- STREAM_SELECT  |PARTITIONED|
+                                    -- STREAM_PROJECT  |PARTITIONED|
+                                      -- ASSIGN  |PARTITIONED|
+                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                          -- BTREE_SEARCH  |PARTITIONED|
+                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                  -- SPLIT  |PARTITIONED|
+                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                          -- RTREE_SEARCH  |PARTITIONED|
+                                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                              -- ASSIGN  |PARTITIONED|
+                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                  -- ASSIGN  |PARTITIONED|
+                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                -- STREAM_PROJECT  |PARTITIONED|
+                                  -- STREAM_SELECT  |PARTITIONED|
+                                    -- STREAM_PROJECT  |PARTITIONED|
+                                      -- ASSIGN  |PARTITIONED|
+                                        -- STREAM_PROJECT  |PARTITIONED|
+                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                            -- SPLIT  |PARTITIONED|
+                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                    -- RTREE_SEARCH  |PARTITIONED|
+                                                      -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                        -- ASSIGN  |PARTITIONED|
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            -- ASSIGN  |PARTITIONED|
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-subscribe.plan
similarity index 92%
rename from asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
rename to asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-subscribe.plan
index 8fa535c..a5a40c1 100644
--- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-subscribe.plan
@@ -1,13 +1,13 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$100, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$100, $$101, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$100(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$100, $$channelExecutionTime]  |PARTITIONED|
+        -- STABLE_SORT [$$100(ASC), $$101(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$100, $$101, $$channelExecutionTime]  |PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STABLE_SORT [$$85(ASC)]  |PARTITIONED|
@@ -35,8 +35,8 @@
                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- STREAM_PROJECT  |PARTITIONED|
                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                  -- HYBRID_HASH_JOIN [$$92, $$90][$$86, $$87]  |PARTITIONED|
-                                                                    -- HASH_PARTITION_EXCHANGE [$$92, $$90]  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$91, $$89][$$86, $$87]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$91, $$89]  |PARTITIONED|
                                                                       -- STREAM_PROJECT  |PARTITIONED|
                                                                         -- ASSIGN  |PARTITIONED|
                                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-unsubscribe.plan
similarity index 92%
rename from asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
rename to asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-unsubscribe.plan
index c66b5ca..6fe8ed6 100644
--- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
+++ b/asterix-bad/src/test/resources/optimizerts/results/bad_rq/channel-unsubscribe.plan
@@ -1,13 +1,13 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$100, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$100, $$101, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$100(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$100, $$channelExecutionTime]  |PARTITIONED|
+        -- STABLE_SORT [$$100(ASC), $$101(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$100, $$101, $$channelExecutionTime]  |PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STABLE_SORT [$$85(ASC)]  |PARTITIONED|
@@ -35,8 +35,8 @@
                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- STREAM_PROJECT  |PARTITIONED|
                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                  -- HYBRID_HASH_JOIN [$$92, $$90][$$86, $$87]  |PARTITIONED|
-                                                                    -- HASH_PARTITION_EXCHANGE [$$92, $$90]  |PARTITIONED|
+                                                                  -- HYBRID_HASH_JOIN [$$91, $$89][$$86, $$87]  |PARTITIONED|
+                                                                    -- HASH_PARTITION_EXCHANGE [$$91, $$89]  |PARTITIONED|
                                                                       -- STREAM_PROJECT  |PARTITIONED|
                                                                         -- ASSIGN  |PARTITIONED|
                                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-push.plan b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-push.plan
deleted file mode 100644
index b79afd7..0000000
--- a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-push.plan
+++ /dev/null
@@ -1,92 +0,0 @@
--- NOTIFY_BROKERS  |PARTITIONED|
-  -- STREAM_PROJECT  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- ASSIGN  |PARTITIONED|
-        -- STREAM_PROJECT  |PARTITIONED|
-          -- STREAM_SELECT  |PARTITIONED|
-            -- STREAM_PROJECT  |PARTITIONED|
-              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$137][$$144]  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$137]  |PARTITIONED|
-                    -- STREAM_PROJECT  |PARTITIONED|
-                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$135, $$133][$$126, $$127]  |PARTITIONED|
-                          -- HASH_PARTITION_EXCHANGE [$$135, $$133]  |PARTITIONED|
-                            -- STREAM_PROJECT  |PARTITIONED|
-                              -- ASSIGN  |PARTITIONED|
-                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  -- DATASOURCE_SCAN  |PARTITIONED|
-                                    -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                      -- ASSIGN  |UNPARTITIONED|
-                                        -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                          -- HASH_PARTITION_EXCHANGE [$$126, $$127]  |PARTITIONED|
-                            -- STREAM_PROJECT  |PARTITIONED|
-                              -- ASSIGN  |PARTITIONED|
-                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  -- DATASOURCE_SCAN  |PARTITIONED|
-                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$144]  |PARTITIONED|
-                    -- NESTED_LOOP  |PARTITIONED|
-                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- STREAM_SELECT  |PARTITIONED|
-                          -- ASSIGN  |PARTITIONED|
-                            -- STREAM_PROJECT  |PARTITIONED|
-                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- DATASOURCE_SCAN  |PARTITIONED|
-                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                      -- BROADCAST_EXCHANGE  |PARTITIONED|
-                        -- PRE_CLUSTERED_GROUP_BY[$$176]  |PARTITIONED|
-                                {
-                                  -- AGGREGATE  |LOCAL|
-                                    -- STREAM_SELECT  |LOCAL|
-                                      -- NESTED_TUPLE_SOURCE  |LOCAL|
-                                }
-                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                            -- STABLE_SORT [$$176(ASC)]  |PARTITIONED|
-                              -- HASH_PARTITION_EXCHANGE [$$176]  |PARTITIONED|
-                                -- UNION_ALL  |PARTITIONED|
-                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STREAM_PROJECT  |PARTITIONED|
-                                      -- STREAM_SELECT  |PARTITIONED|
-                                        -- STREAM_PROJECT  |PARTITIONED|
-                                          -- ASSIGN  |PARTITIONED|
-                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                              -- BTREE_SEARCH  |PARTITIONED|
-                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                  -- STREAM_PROJECT  |PARTITIONED|
-                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                      -- SPLIT  |PARTITIONED|
-                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                          -- STREAM_PROJECT  |PARTITIONED|
-                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                              -- RTREE_SEARCH  |PARTITIONED|
-                                                                -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                                                  -- ASSIGN  |PARTITIONED|
-                                                                    -- STREAM_PROJECT  |PARTITIONED|
-                                                                      -- ASSIGN  |PARTITIONED|
-                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
-                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STREAM_PROJECT  |PARTITIONED|
-                                      -- STREAM_SELECT  |PARTITIONED|
-                                        -- STREAM_PROJECT  |PARTITIONED|
-                                          -- ASSIGN  |PARTITIONED|
-                                            -- STREAM_PROJECT  |PARTITIONED|
-                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                -- SPLIT  |PARTITIONED|
-                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                    -- STREAM_PROJECT  |PARTITIONED|
-                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                        -- RTREE_SEARCH  |PARTITIONED|
-                                                          -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                                            -- ASSIGN  |PARTITIONED|
-                                                              -- STREAM_PROJECT  |PARTITIONED|
-                                                                -- ASSIGN  |PARTITIONED|
-                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                    -- DATASOURCE_SCAN  |PARTITIONED|
-                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterix-bad/src/test/resources/runtimets/only_bad.xml b/asterix-bad/src/test/resources/runtimets/only_bad.xml
new file mode 100644
index 0000000..d6e89bb
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/only_bad.xml
@@ -0,0 +1,25 @@
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one
+ ! or more contributor license agreements. See the NOTICE file
+ ! distributed with this work for additional information
+ ! regarding copyright ownership. The ASF licenses this file
+ ! to you under the Apache License, Version 2.0 (the
+ ! "License"); you may not use this file except in compliance
+ ! with the License. You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing,
+ ! software distributed under the License is distributed on an
+ ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ! KIND, either express or implied.    See the License for the
+ ! specific language governing permissions and limitations
+ ! under the License.
+ !-->
+<test-suite  xmlns="urn:xml.testframework.asterix.apache.org"
+             ResultOffsetPath="results"
+             QueryOffsetPath="queries"
+             QueryFileExtension=".sqlpp">
+  <test-group name="failed">
+  </test-group>
+</test-suite>
diff --git a/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.1.ddl.sqlpp
new file mode 100644
index 0000000..9f938f7
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.1.ddl.sqlpp
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+DROP DATASET Tweets IF EXISTS;
+DROP TYPE Tweet IF EXISTS;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+CREATE DATASET Tweets2(Tweet) PRIMARY KEY tid;
+
+CREATE INDEX s_rating ON Tweets(area_code);
+CREATE INDEX s_location ON Tweets(location) type RTREE;
+
+
+CREATE INDEX s_rating2 ON Tweets2(area_code);
+CREATE INDEX s_location2 ON Tweets2(location) type RTREE;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.2.update.sqlpp
new file mode 100644
index 0000000..961a587
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.2.update.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+use test;
+
+INSERT INTO Tweets([{"tid" : 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
+UPSERT INTO Tweets([{"tid" : 1000, "area_code": "46", "text": "Tweet 2", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
+
+INSERT INTO Tweets2([{"tid" : 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
+UPSERT INTO Tweets2([{"tid" : 1000, "area_code": "45", "text": "Tweet 2", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.3.update.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.3.update.sqlpp
index b7bb951..a566da2 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.3.update.sqlpp
@@ -16,10 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+use test;
+DELETE FROM Tweets t WHERE t.tid = 1000;
+DELETE FROM Tweets2 t2 WHERE t2.tid = 1000;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.4.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.4.query.sqlpp
index b7bb951..2d6b123 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.4.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t FROM Tweets2 t ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.5.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.5.query.sqlpp
index b7bb951..a266db3 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_delete/active_dataset_delete.5.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t, meta(t).`_active_timestamp` as Time FROM Tweets t ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.1.ddl.sqlpp
new file mode 100644
index 0000000..9f938f7
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.1.ddl.sqlpp
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+DROP DATASET Tweets IF EXISTS;
+DROP TYPE Tweet IF EXISTS;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+CREATE DATASET Tweets2(Tweet) PRIMARY KEY tid;
+
+CREATE INDEX s_rating ON Tweets(area_code);
+CREATE INDEX s_location ON Tweets(location) type RTREE;
+
+
+CREATE INDEX s_rating2 ON Tweets2(area_code);
+CREATE INDEX s_location2 ON Tweets2(location) type RTREE;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.2.update.sqlpp
similarity index 78%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.2.update.sqlpp
index b1a132b..42a5a10 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.2.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+INSERT INTO Tweets([{"tid" : 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.3.update.sqlpp
similarity index 78%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.3.update.sqlpp
index b1a132b..55bec97 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.3.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+INSERT INTO Tweets2([{"tid" : 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.4.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.4.query.sqlpp
index b7bb951..a266db3 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.4.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t, meta(t).`_active_timestamp` as Time FROM Tweets t ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.5.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.5.query.sqlpp
index b7bb951..2d6b123 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_insert/active_dataset_insert.5.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t FROM Tweets2 t ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.1.ddl.sqlpp
new file mode 100644
index 0000000..9f938f7
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.1.ddl.sqlpp
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+DROP DATASET Tweets IF EXISTS;
+DROP TYPE Tweet IF EXISTS;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+CREATE DATASET Tweets2(Tweet) PRIMARY KEY tid;
+
+CREATE INDEX s_rating ON Tweets(area_code);
+CREATE INDEX s_location ON Tweets(location) type RTREE;
+
+
+CREATE INDEX s_rating2 ON Tweets2(area_code);
+CREATE INDEX s_location2 ON Tweets2(location) type RTREE;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.2.update.sqlpp
similarity index 78%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.2.update.sqlpp
index b1a132b..7e94456 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.2.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+UPSERT INTO Tweets([{"tid" : 1000, "area_code": "45", "text": "Tweet 2", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.3.update.sqlpp
similarity index 78%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.3.update.sqlpp
index b1a132b..2e97f48 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.3.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+UPSERT INTO Tweets2([{"tid" : 1000, "area_code": "45", "text": "Tweet 2", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.4.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.4.query.sqlpp
index b7bb951..a266db3 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.4.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t, meta(t).`_active_timestamp` as Time FROM Tweets t ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.5.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.5.query.sqlpp
index b7bb951..2d6b123 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_dataset_upsert/active_dataset_upsert.5.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t FROM Tweets2 t ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.1.ddl.sqlpp
similarity index 70%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.1.ddl.sqlpp
index b1a132b..936b50c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.1.ddl.sqlpp
@@ -16,12 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+DROP DATASET Tweets IF EXISTS;
+DROP TYPE Tweet IF EXISTS;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
+
+//CREATE INDEX s_rating ON Tweets(hateful_rating);
+//CREATE INDEX s_location ON Tweets(location) type RTREE;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.2.update.sqlpp
similarity index 78%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.2.update.sqlpp
index b1a132b..83c892d 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.2.update.sqlpp
@@ -16,12 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE FEED TweetFeed WITH {
+  "adapter-name" : "localfs",
+  "path" : "asterix_nc1://data/tweets.txt",
+  "type-name":"Tweet",
+  "format": "adm"
+};
+
+CONNECT FEED TweetFeed TO DATASET Tweets;
+
+START FEED TweetFeed;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.3.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.3.query.sqlpp
index b7bb951..28ba203 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_feeds/active_feeds.3.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT t, meta(t).`_active_timestamp` as Time FROM Tweets t where t.threatening_flag = true ORDER BY t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.1.ddl.sqlpp
similarity index 77%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.1.ddl.sqlpp
index 220f05a..d37cd2c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.1.ddl.sqlpp
@@ -16,13 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-use channels;
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
 
-drop channel EmergenciesNearMeChannel;
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.2.update.sqlpp
similarity index 75%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.2.update.sqlpp
index b1a132b..d174faf 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.2.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+INSERT INTO Tweets([{"tid" : 999, "area_code": "45", "text": "Xikui likes Google, but Mike likes AsterixDB.", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.3.update.sqlpp
similarity index 83%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.3.update.sqlpp
index b7bb951..227bebd 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.3.update.sqlpp
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+
+CREATE FUNCTION Tweets(code)
+{
+  SELECT t
+  FROM Tweets t WHERE area_code = t.area_code AND previous_channel_time(t) < current_datetime()
+};
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.4.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.4.query.sqlpp
index b7bb951..5f67a9b 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_function_in_udf/active_function_in_udf.4.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+Tweets("45");
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.1.ddl.sqlpp
similarity index 72%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.1.ddl.sqlpp
index b1a132b..2fc3783 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.1.ddl.sqlpp
@@ -16,12 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+DROP DATASET Tweets IF EXISTS;
+DROP TYPE Tweet IF EXISTS;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint,
+ area_code: string,
+ text: string,
+ location: point,
+ timestamp: datetime
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.2.update.sqlpp
similarity index 73%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.2.update.sqlpp
index b1a132b..8945806 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.2.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+use test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+INSERT INTO Tweets([{"tid" : 999, "area_code": "45", "text": "Jia sells Google, and Xikui likes Facebook, but Mike betrays AsterixDB.", "location": point("1998078.3009357268, 1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": False}]);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.3.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.3.query.sqlpp
index b7bb951..0d719c7 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/active_functions/active_functions.3.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SELECT current_channel_time(t) as Time_current_channel, previous_channel_time(t) as previous_channel_time FROM Tweets t;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.1.ddl.sqlpp
similarity index 65%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.1.ddl.sqlpp
index 3e2d5c0..5624725 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.1.ddl.sqlpp
@@ -16,14 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
+drop dataverse experiments if exists;
+create dataverse experiments;
+use experiments;
 
+create type TweetMessageType as open {
+    id : string
+};
 
-use channels;
+create ACTIVE dataset Tweets(TweetMessageType) primary key id;
 
-subscribe to roomRecords (123) on brokerA;
+create feed TweetFeed with {
+  "adapter-name" : "http_adapter",
+  "addresses" : "asterix_nc2:10002,asterix_nc1:10001",
+  "address-type" : "NC",
+  "type-name" : "TweetMessageType",
+  "format" : "adm",
+  "dynamic" : true
+};
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.2.update.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.2.update.sqlpp
index b7bb951..75f92d5 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.2.update.sqlpp
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+use experiments;
+set `wait-for-completion-feed` "false";
+
+connect feed TweetFeed to dataset Tweets;
+start feed TweetFeed;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.3.post.http
similarity index 67%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.3.post.http
index b1a132b..38d2959 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.3.post.http
@@ -16,12 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
-
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+nc:asterix_nc2:10002 /
+--body={ "id": "nc2:1", "username": "magarika", "location": "", "text": "RT @ken24xavier: Obama tells SOROS - our plan is ALMOST finished http://t.co/WvzK0GtU", "timestamp": "Thu Dec 06 16:53:05 PST 2012" }{ "id": "nc2:2", "username": "jaysauce82", "location": "", "text": "Not voting for President Obama #BadDecision", "timestamp": "Thu Dec 06 16:53:16 PST 2012" }
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.4.post.http
similarity index 77%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.4.post.http
index b1a132b..b5632d2 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.4.post.http
@@ -16,12 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
-
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+nc:asterix_nc1:10001 /
+--body={ "id": "nc1:1", "username": "magarika", "location": "", "text": "RT @ken24xavier: Obama tells SOROS - our plan is ALMOST finished http://t.co/WvzK0GtU", "timestamp": "Thu Dec 06 16:53:05 PST 2012" }
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.5.sleep.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.5.sleep.sqlpp
index b7bb951..2ea09b0 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.5.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+1500
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.6.update.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.6.update.sqlpp
index b7bb951..48690f3 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.6.update.sqlpp
@@ -16,10 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+use experiments;
+stop feed TweetFeed;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.7.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.7.query.sqlpp
index b7bb951..bcddf7a 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.7.query.sqlpp
@@ -16,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+use experiments;
+
+select value count(t) from Tweets as t;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.8.ddl.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.8.ddl.sqlpp
index b7bb951..e4d2615 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_http_feed/bad_http_feed.8.ddl.sqlpp
@@ -16,10 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+use experiments;
+drop dataverse experiments;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.1.ddl.sqlpp
similarity index 65%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.1.ddl.sqlpp
index b1a132b..39a6908 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.1.ddl.sqlpp
@@ -16,12 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+DROP DATAVERSE test if exists;
+CREATE DATAVERSE test;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+create type Tweet as open {
+  tid : bigint
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) primary key tid;
+
+CREATE FEED TweetFeed with {
+  "adapter-name" : "http_adapter",
+  "addresses" : "127.0.0.1:10001",
+  "address-type" : "IP",
+  "type-name" : "Tweet",
+  "format" : "adm",
+  "dynamic" : "false"
+};
+
+CONNECT FEED TweetFeed to dataset Tweets;
+START FEED TweetFeed;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.10.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.10.query.sqlpp
index b7bb951..0959ad1 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.10.query.sqlpp
@@ -16,10 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+use test;
+
+FROM LocalThreateningTweets l
+UNNEST l.results r
+SELECT VALUE r.result.t ORDER BY r.result.t.tid;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.2.ddl.sqlpp
similarity index 81%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.2.ddl.sqlpp
index 220f05a..d3fe34e 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.2.ddl.sqlpp
@@ -16,13 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
+use test;
 
-use channels;
-
-drop channel EmergenciesNearMeChannel;
+CREATE CONTINUOUS PUSH CHANNEL ThreateningTweetsAt(area_name) PERIOD duration("PT2S") {
+    SELECT t
+    FROM Tweets t
+    WHERE t.area_name = area_name AND is_new(t)
+};
diff --git a/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.3.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.3.ddl.sqlpp
new file mode 100644
index 0000000..4d4bc1a
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.3.ddl.sqlpp
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+use test;
+
+CREATE TYPE LocalThreateningTweet AS {
+  channelExecutionEpochTime: bigint,
+  dataverseName: string,
+  channelName: string
+};
+
+CREATE DATASET LocalThreateningTweets(LocalThreateningTweet) PRIMARY KEY channelExecutionEpochTime;
+
+// Here we cannot use BAD feeds, since the remote calls in BAD feeds causes test cases to halt
+CREATE FEED LocalThreateningTweetFeed WITH {
+  "adapter-name" : "http_adapter",
+  "addresses" : "127.0.0.1:10002",
+  "address-type" : "IP",
+  "type-name" : "LocalThreateningTweet",
+  "format" : "adm"
+};
+
+CONNECT FEED LocalThreateningTweetFeed TO DATASET LocalThreateningTweets;
+START FEED LocalThreateningTweetFeed;
+
+CREATE BROKER OCPD_BAD_Broker AT "http://127.0.0.1:10002" with {
+  "broker-type" : "BAD"
+};
+SUBSCRIBE TO ThreateningTweetsAt("OC") on OCPD_BAD_Broker;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.4.post.http
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.4.post.http
index b7bb951..0f4f9e7 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.4.post.http
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+nc:asterix_nc1:10001 /
+--body={"tid" : 0, "area_name": "OC", "text": "OC Tweet"}{"tid" : 1, "area_name": "UCI", "text": "UCI Tweet"}
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.5.sleep.sqlpp
similarity index 86%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.5.sleep.sqlpp
index b7bb951..5f299bc 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.5.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+5000
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.6.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.6.query.sqlpp
index b7bb951..0959ad1 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.6.query.sqlpp
@@ -16,10 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+use test;
+
+FROM LocalThreateningTweets l
+UNNEST l.results r
+SELECT VALUE r.result.t ORDER BY r.result.t.tid;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.7.ddl.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.7.ddl.sqlpp
index b7bb951..788507c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.7.ddl.sqlpp
@@ -16,10 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+use test;
+
+STOP FEED LocalThreateningTweetFeed;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.8.post.http
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.8.post.http
index b7bb951..c146b00 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.8.post.http
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+nc:asterix_nc1:10001 /
+--body={"tid" : 2, "area_name": "OC", "text": "OC Tweet"}{"tid" : 3, "area_name": "UCI", "text": "UCI Tweet"}
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.9.sleep.sqlpp
similarity index 86%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.9.sleep.sqlpp
index b7bb951..5f299bc 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/bad_islands/bad_islands.9.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+5000
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.1.ddl.sqlpp
similarity index 82%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.1.ddl.sqlpp
index b7bb951..e30e8e9 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.1.ddl.sqlpp
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE Tweet AS OPEN {
+ tid: bigint
+};
+
+CREATE ACTIVE DATASET Tweets(Tweet) PRIMARY KEY tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.2.update.sqlpp
similarity index 76%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.2.update.sqlpp
index b1a132b..0ab3f13 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.2.update.sqlpp
@@ -16,12 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
+USE test;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+CREATE FEED TweetFeed WITH {
+  "adapter-name" : "localfs",
+  "path" : "asterix_nc1://data/tweets.txt",
+  "type-name":"Tweet",
+  "format" : "adm",
+  "insert-feed" : true
+};
+
+CONNECT FEED TweetFeed TO DATASET Tweets;
+
+START FEED TweetFeed;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.3.update.sqlpp
similarity index 69%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.3.update.sqlpp
index b1a132b..45cc2f5 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.3.update.sqlpp
@@ -16,12 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-use channels;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+USE test;
+
+CREATE CONTINUOUS CHANNEL ThreateningTweetsAt(area_name) PERIOD duration("PT2S") {
+    SELECT t, current_channel_time("ThreateningTweetsAt") as TimeCurrent , previous_channel_time("ThreateningTweetsAt") as TimePrevious
+    FROM Tweets t
+    WHERE t.area_name = area_name
+      AND is_new(t)
+};
+
+
+CREATE BROKER brokerA AT "http://127.0.0.1:10100";
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.4.update.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.4.update.sqlpp
index b7bb951..fc9d1af 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.4.update.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+USE test;
+SUBSCRIBE TO ThreateningTweetsAt("LA") on brokerA;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.5.sleep.sqlpp
similarity index 86%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.5.sleep.sqlpp
index b7bb951..5f299bc 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.5.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+5000
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.6.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.6.query.sqlpp
index b7bb951..289d213 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_cq/new_tweets_from_area/new_tweets_from_area.6.query.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+use test;
+SELECT VALUE r.result from ThreateningTweetsAtResults r ORDER BY r.result.t.tid;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.1.ddl.sqlpp
similarity index 89%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.1.ddl.sqlpp
index 819d052..5badc4c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Check Whether a Channel works after adding a new Index
-* Expected Res : Success
-* Date         : Apr 2018
-* Author       : Steven Jacobs
-*/
-
 drop dataverse channels if exists;
 create dataverse channels;
 use channels;
@@ -56,14 +49,12 @@
 
 
 create function RecentEmergenciesNearUser(userName) {
-  (
   select report, shelters from
-   ( select value r from Reports r)report,
+   (select value r from Reports r)report,
   UserLocations u
     let shelters = (select s.location from Shelters s where spatial_intersect(s.location,u.location))
   where u.userName = userName
   and spatial_intersect(report.location,u.location)
-  )
 };
 
 create repetitive channel EmergencyChannel using RecentEmergenciesNearUser@1 period duration("PT10S");
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.2.update.sqlpp
similarity index 99%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.2.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.2.update.sqlpp
index 0a38e41..dbd8cf4 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.2.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Check Whether a Channel works after adding a new Index
-* Expected Res : Success
-* Date         : Apr 2018
-* Author       : channels Jacobs
-*/
 
 use channels;
 
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.3.update.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.3.update.sqlpp
index b7bb951..52cd9a9 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.3.update.sqlpp
@@ -16,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+use channels;
+
+create index delivery on EmergencyChannelResults(deliveryTime);
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.4.sleep.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.4.sleep.sqlpp
index b7bb951..06985bd 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.4.sleep.sqlpp
@@ -16,10 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+15000
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.5.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.5.query.sqlpp
similarity index 85%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.5.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.5.query.sqlpp
index dd6e1ca..eebfbc4 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.5.query.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.5.query.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Check Whether a Channel works after adding a new Index
-* Expected Res : Success
-* Date         : Apr 2018
-* Author       : Steven Jacobs
-*/
-
 use channels;
 
 select value array_count(
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.6.ddl.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.6.ddl.sqlpp
index b7bb951..45b1194 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/add_index/add_index.6.ddl.sqlpp
@@ -16,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+
+use channels;
+
+drop channel EmergencyChannel;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp
similarity index 91%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp
index b85ba91..addc85f 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Create Channel Test
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
 
 drop dataverse channels if exists;
 create dataverse channels;
@@ -48,4 +42,4 @@
   and spatial_intersect(m.sender_location, place))
 };
 
-create repetitive channel nearbyTweetChannel using NearbyTweetsContainingText@2 period duration("PT10M");
\ No newline at end of file
+create repetitive channel nearbyTweetChannel using NearbyTweetsContainingText@2 period duration("PT10M");
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.3.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_datasets/create_channel_check_datasets.3.query.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.3.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_datasets/create_channel_check_datasets.3.query.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
similarity index 91%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
index b85ba91..7e314d5 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Create Channel Test
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
-
 drop dataverse channels if exists;
 create dataverse channels;
 use channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.3.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_metadata/create_channel_check_metadata.3.query.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.3.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/create_channel_check_metadata/create_channel_check_metadata.3.query.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.1.ddl.sqlpp
similarity index 90%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.1.ddl.sqlpp
index e8d57a6..fb4b81e 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-
 drop dataverse channels if exists;
 create dataverse channels;
 use channels;
@@ -54,15 +47,16 @@
 
 create broker brokerA at "http://www.notifyA.com";
 
+// since BAD-RQ doesn't provide continuous semantics, adding temporal predicate would cause test case to fail randomly
 create function EmergenciesNearMe(emergencyType, uid){
-  (with tenMinutesAgo as current_datetime() - day_time_duration("PT10S")
+  (with tenMinutesAgo as current_datetime() - day_time_duration("PT5S")
   select report as report, shelters as shelters
   from EmergencyReports report, UserLocations user
   let shelters = (select * from EmergencyShelters shelter
     where spatial_intersect(report.impactZone,shelter.location))
   where user.user_id = uid
-    and report.timestamp >= tenMinutesAgo
-    and user.timestamp >= tenMinutesAgo
+    //and report.timestamp >= tenMinutesAgo
+    //and user.timestamp >= tenMinutesAgo
     and report.emergencyType = emergencyType
     and spatial_intersect(report.impactZone,create_point(user.latitude,user.longitude)))
 };
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.2.update.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.2.update.sqlpp
index b1a132b..44c13df 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.2.update.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
 use channels;
 
 subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.3.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.3.update.sqlpp
similarity index 79%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.3.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.3.update.sqlpp
index 292151e..b3d2f6c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.3.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.3.update.sqlpp
@@ -16,18 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
 
 use channels;
 upsert into UserLocations([
-{"user_id":1, "latitude":5, "longitude":5, "timestamp":current_datetime()},
-{"user_id":2, "latitude":10, "longitude":10, "timestamp":current_datetime()},
-{"user_id":3, "latitude":15, "longitude":15, "timestamp":current_datetime()}]
+{"user_id":1, "latitude":5.0, "longitude":5.0, "timestamp":current_datetime()},
+{"user_id":2, "latitude":10.0, "longitude":10.0, "timestamp":current_datetime()},
+{"user_id":3, "latitude":15.0, "longitude":15.0, "timestamp":current_datetime()}]
 );
 upsert into EmergencyShelters([
 {"name":"A", "location":create_point(5.0,5.0)},
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.4.sleep.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.4.sleep.sqlpp
index b7bb951..af2f691 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.4.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+10000
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.5.query.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.5.query.sqlpp
index b7bb951..626ec87 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.5.query.sqlpp
@@ -16,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+use channels;
+select value array_count (result.result.shelters)
+from EmergenciesNearMeChannelResults result
+limit 1;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
index 220f05a..0be897c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/disasters_with_friends/disasters_with_friends.6.ddl.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
 
 use channels;
 
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp
similarity index 92%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp
index 1c7fdcc..6aad378 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Channel Test. Check Metadata
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
 
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.2.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.2.ddl.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.2.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.2.ddl.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp
similarity index 92%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp
index 1c7fdcc..dbd4d6d 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Channel Test. Check Metadata
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
-
 drop dataverse channels if exists;
 create dataverse channels;
 use channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.2.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.2.ddl.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.2.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.2.ddl.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.3.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.3.query.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.3.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.3.query.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_function/drop_function.1.ddl.sqlpp
similarity index 92%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_function/drop_function.1.ddl.sqlpp
index a5d3775..8e20d86 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_function/drop_function.1.ddl.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Channel Function
-* Expected Res : Error
-* Date         : Jan 2018
-* Author       : Steven Jacobs
-*/
 
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
similarity index 91%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
index d1047b0..e22deb1 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Channel Function Dataverse
-* Expected Res : Error
-* Date         : Jan 2018
-* Author       : Steven Jacobs
-*/
-
 drop dataverse channels if exists;
 create dataverse channels;
 use channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_index/drop_index.1.ddl.sqlpp
similarity index 94%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_index/drop_index.1.ddl.sqlpp
index ca01dd7..38a70fb 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_index/drop_index.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Function Dataset Index
-* Expected Res : Error
-* Date         : Jan 2018
-* Author       : Steven Jacobs
-*/
-
 drop dataverse two if exists;
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_results/drop_results.1.ddl.sqlpp
similarity index 92%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_results/drop_results.1.ddl.sqlpp
index 432f3c5..f61f050 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_results/drop_results.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Channel Results
-* Expected Res : Error
-* Date         : Jan 2018
-* Author       : Steven Jacobs
-*/
-
 drop dataverse two if exists;
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
similarity index 92%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
index f6dc2bf..b33d7c4 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Drop Channel Subscriptions
-* Expected Res : Error
-* Date         : Jan 2018
-* Author       : Steven Jacobs
-*/
-
 drop dataverse two if exists;
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.1.ddl.sqlpp
similarity index 93%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.1.ddl.sqlpp
index 638f7b5..d4f2b01 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
 drop dataverse two if exists;
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.2.update.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.2.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.2.update.sqlpp
index 3e2d5c0..1ab9c30 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.2.update.sqlpp
@@ -16,14 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
-
 use channels;
 
 subscribe to roomRecords (123) on brokerA;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.3.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.3.update.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.3.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.3.update.sqlpp
index 2e00f6a..8754dc1 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.3.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.3.update.sqlpp
@@ -16,14 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
-
 use channels;
 
 subscribe to roomRecords (350) on brokerB;
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.4.query.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.4.query.sqlpp
index 8612077..a83e597 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.4.query.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
 use channels;
 
 select test.BrokerName, test.param0
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.5.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.5.update.sqlpp
similarity index 88%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.5.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.5.update.sqlpp
index 2499ac7..56ecc59 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.5.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.5.update.sqlpp
@@ -16,14 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
-
 use channels;
 
 
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.6.sleep.sqlpp
similarity index 86%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.6.sleep.sqlpp
index b7bb951..18865b0 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.6.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
 5000
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.7.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.7.update.sqlpp
similarity index 88%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.7.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.7.update.sqlpp
index eb7ee2e..c5db418 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.7.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.7.update.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
 use channels;
 
 upsert into UserLocations([
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.8.query.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.8.query.sqlpp
index 91473b9..a6c284c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.8.query.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
 use channels;
 
 select result.result.userId
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.9.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.9.ddl.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.9.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/room_occupants/room_occupants.9.ddl.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp
similarity index 91%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp
index b85ba91..bfc8d0e 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Create Channel Test
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
-
 drop dataverse channels if exists;
 create dataverse channels;
 use channels;
@@ -48,4 +41,6 @@
   and spatial_intersect(m.sender_location, place))
 };
 
-create repetitive channel nearbyTweetChannel using NearbyTweetsContainingText@2 period duration("PT10M");
\ No newline at end of file
+create broker brokerA at "http://www.notifyA.com";
+
+create repetitive channel nearbyTweetChannel using NearbyTweetsContainingText@2 period duration("PT10M");
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.2.update.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.2.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.2.update.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.3.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.3.update.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.3.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.3.update.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.4.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.4.update.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.4.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.4.update.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp
similarity index 80%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp
index a21a4be..6475001 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Long Term Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
 
 drop dataverse channels if exists;
 create dataverse channels;
@@ -41,6 +35,6 @@
   where location.roomNumber = room)
 };
 
-create broker brokerA at "http://www.notifyA.com";
+CREATE BROKER brokerA at "http://127.0.0.1:5020/echo";
 
-create repetitive channel roomRecords using RoomOccupants@1 period duration("PT10S");
+CREATE REPETITIVE CHANNEL roomRecords USING RoomOccupants@1 PERIOD duration("PT3S");
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.2.update.sqlpp
similarity index 87%
rename from asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.2.update.sqlpp
rename to asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.2.update.sqlpp
index 3e2d5c0..063b13c 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.2.update.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
 
 use channels;
 
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.5.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.3.update.sqlpp
similarity index 87%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.5.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.3.update.sqlpp
index 2499ac7..d4deb02 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.5.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.3.update.sqlpp
@@ -16,17 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
-
 use channels;
 
-
 upsert into UserLocations([
 {"userId":1, "roomNumber":123},
 {"userId":2, "roomNumber":222},
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.4.sleep.sqlpp
similarity index 85%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.4.sleep.sqlpp
index b7bb951..a3490bb 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.6.sleep.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.4.sleep.sqlpp
@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-5000
+10000
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.5.query.sqlpp
similarity index 76%
copy from asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
copy to asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.5.query.sqlpp
index b1a132b..c8d736f 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.2.update.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/bad_rq/ten_minute_channel/ten_minute_channel.5.query.sqlpp
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 /*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
+ Sample Notification:
+ {'dataverseName': 'channels', 'channelName': 'roomRecords', 'channelExecutionEpochTime': 1594924658617, 'subscriptionIds': [['dbf4b346-5fb5-8589-eb67-6a7465060ec7']]}
 */
+
 use channels;
 
-subscribe to EmergenciesNearMeChannel("tornado", 1) on brokerA;
+(select value count(result) from roomRecordsResults)[0] > 2;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.3.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.3.update.sqlpp
deleted file mode 100644
index d0f65e5..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.3.update.sqlpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Check Whether a Channel works after adding a new Index
-* Expected Res : Success
-* Date         : Apr 2018
-* Author       : Steven Jacobs
-*/
-
-use channels;
-
-create index delivery on EmergencyChannelResults(deliveryTime);
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.4.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.4.sleep.sqlpp
deleted file mode 100644
index 5f764b3..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.4.sleep.sqlpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Check Whether a Channel works after adding a new Index
-* Expected Res : Success
-* Date         : Apr 2018
-* Author       : Steven Jacobs
-*/
-
-15000
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.6.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.6.ddl.sqlpp
deleted file mode 100644
index 54075e5..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/add_index/add_index.6.ddl.sqlpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Check Whether a Channel works after adding a new Index
-* Expected Res : Success
-* Date         : Apr 2018
-* Author       : Steven Jacobs
-*/
-
-use channels;
-
-drop channel EmergencyChannel;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp
deleted file mode 100644
index 8e20dcb..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Create Channel Test. Confirms that the subscription and result datasets are created
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
-
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
-
-create type TweetMessageTypeuuid as closed {
-  tweetid: uuid,
-  sender_location: point,
-  send_time: datetime,
-  referred_topics: {{ string }},
-  message_text: string,
-  countA: int32,
-  countB: int32
-};
-
-
-create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid autogenerated;
-
-create function NearbyTweetsContainingText(place, text) {
-  (select m.message_text
-  from TweetMessageuuids m
-  where contains(m.message_text,text)
-  and spatial_intersect(m.sender_location, place))
-};
-
-create repetitive channel nearbyTweetChannel using NearbyTweetsContainingText@2 period duration("PT10M");
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.4.pollquery.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.4.pollquery.sqlpp
deleted file mode 100644
index 0c8ea0c..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/disasters_with_friends/disasters_with_friends.4.pollquery.sqlpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Disasters with friends
-* Expected Res : Success
-* Date         : May 17
-* Author       : Steven Jacobs
-*/
-// polltimeoutsecs=15
-
-use channels;
-select value array_count (result.result.shelters)
-from EmergenciesNearMeChannelResults result
-limit 1;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp
deleted file mode 100644
index 09a74e3..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Create Channel Test. Confirms that the subscription and result datasets are created
-* Expected Res : Success
-* Date         : March 2015
-* Author       : Steven Jacobs
-*/
-
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
-
-create type TweetMessageTypeuuid as closed {
-  tweetid: uuid,
-  sender_location: point,
-  send_time: datetime,
-  referred_topics: {{ string }},
-  message_text: string,
-  countA: int32,
-  countB: int32
-};
-
-
-create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid autogenerated;
-
-create function NearbyTweetsContainingText(place, text) {
-  (select m.message_text
-  from TweetMessageuuids m
-  where contains(m.message_text,text)
-  and spatial_intersect(m.sender_location, place))
-};
-
-create broker brokerA at "http://www.notifyA.com";
-
-create repetitive channel nearbyTweetChannel using NearbyTweetsContainingText@2 period duration("PT10M");
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.3.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.3.update.sqlpp
deleted file mode 100644
index 2499ac7..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.3.update.sqlpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
-
-use channels;
-
-
-upsert into UserLocations([
-{"userId":1, "roomNumber":123},
-{"userId":2, "roomNumber":222},
-{"userId":3, "roomNumber":350}]
-);
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.4.sleep.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.4.sleep.sqlpp
deleted file mode 100644
index c750707..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.4.sleep.sqlpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-110000
diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.5.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.5.query.sqlpp
deleted file mode 100644
index b9282fe..0000000
--- a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.5.query.sqlpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Room Occupants Test
-* Expected Res : Success
-* Date         : Sep 2016
-* Author       : Steven Jacobs
-*/
-
-use channels;
-
-(select value count(result) from roomRecordsResults)[0] > 9;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.1.ddl.sqlpp
index 71b2ed4..9e7e817 100644
--- a/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.1.ddl.sqlpp
+++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.1.ddl.sqlpp
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/*
-* Description  : Create Procedure Check Metadata
-* Expected Res : Success
-* Date         : Jan 2017
-* Author       : Steven Jacobs
-*/
-
 drop dataverse two if exists;
 drop dataverse channels if exists;
 create dataverse channels;
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_delete/active_datasets.4.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_delete/active_datasets.4.adm
new file mode 100644
index 0000000..f942886
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_delete/active_datasets.4.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false } }
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_delete/active_datasets.5.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_delete/active_datasets.5.adm
new file mode 100644
index 0000000..39ec400
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_delete/active_datasets.5.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false }, "Time": datetime("2020-08-18T06:46:51.696Z") }
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_insert/active_datasets.4.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_insert/active_datasets.4.adm
new file mode 100644
index 0000000..fd14e79
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_insert/active_datasets.4.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false }, "Time": datetime("2020-08-18T06:46:51.696Z") }
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_insert/active_datasets.5.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_insert/active_datasets.5.adm
new file mode 100644
index 0000000..f942886
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_insert/active_datasets.5.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 999, "area_code": "45", "text": "Tweet 1.", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false } }
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_upsert/active_datasets.4.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_upsert/active_datasets.4.adm
new file mode 100644
index 0000000..75265d3
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_upsert/active_datasets.4.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 1000, "area_code": "45", "text": "Tweet 2", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false }, "Time": datetime("2020-08-18T06:46:51.782Z") }
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_upsert/active_datasets.5.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_upsert/active_datasets.5.adm
new file mode 100644
index 0000000..120a825
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_dataset_upsert/active_datasets.5.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 1000, "area_code": "45", "text": "Tweet 2", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false } }
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_feeds/active_feeds.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_feeds/active_feeds.1.adm
new file mode 100644
index 0000000..9d1182c
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_feeds/active_feeds.1.adm
@@ -0,0 +1,6 @@
+{ "t": { "tid": 0, "area_name": "UCI", "suspicious_level": 9, "text": "Tweet 1", "location": point("68.41629186478751,44.631424133284966"), "timestamp": datetime("2018-11-09T00:00:00.000Z"), "threatening_flag": true }, "Time": datetime("2020-08-18T04:06:15.641Z") }
+{ "t": { "tid": 2, "area_name": "LA", "suspicious_level": 10, "text": "Tweet 3", "location": point("4037.165975321966,4020.6200896429373"), "timestamp": datetime("2018-08-14T00:00:00.000Z"), "threatening_flag": true }, "Time": datetime("2020-08-18T04:06:15.641Z") }
+{ "t": { "tid": 3, "area_name": "UCI", "suspicious_level": 5, "text": "Tweet 4", "location": point("6011.1101544678095,6033.86438259922"), "timestamp": datetime("2018-05-18T00:00:00.000Z"), "threatening_flag": true }, "Time": datetime("2020-08-18T04:06:15.641Z") }
+{ "t": { "tid": 6, "area_name": "LA", "suspicious_level": 9, "text": "Tweet 7", "location": point("12074.059527318483,12008.549148129303"), "timestamp": datetime("2017-04-23T00:00:00.000Z"), "threatening_flag": true }, "Time": datetime("2020-08-18T04:06:15.641Z") }
+{ "t": { "tid": 8, "area_name": "LA", "suspicious_level": 8, "text": "Tweet 9", "location": point("16051.9846352692,16078.599078960015"), "timestamp": datetime("2018-03-27T00:00:00.000Z"), "threatening_flag": true }, "Time": datetime("2020-08-18T04:06:15.641Z") }
+{ "t": { "tid": 10, "area_name": "SD", "suspicious_level": 0, "text": "Tweet 11", "location": point("20088.467372365518,20051.89371416724"), "timestamp": datetime("2017-10-01T00:00:00.000Z"), "threatening_flag": true }, "Time": datetime("2020-08-18T04:06:15.641Z") }
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_function_in_udf/active_function_in_udf.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_function_in_udf/active_function_in_udf.1.adm
new file mode 100644
index 0000000..3693880
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_function_in_udf/active_function_in_udf.1.adm
@@ -0,0 +1 @@
+{ "t": { "tid": 999, "area_code": "45", "text": "Xikui likes Google, but Mike likes AsterixDB.", "location": point("1998078.3009357268,1998011.0235705695"), "timestamp": datetime("2019-12-03T17:59:52.041Z"), "hatefulFlag": false } }
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_functions/active_functions.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_functions/active_functions.1.adm
new file mode 100644
index 0000000..e9c0934
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/active_functions/active_functions.1.adm
@@ -0,0 +1 @@
+{ "Time_current_channel": datetime("2020-05-28T02:23:55.887Z"), "previous_channel_time": datetime("1970-01-01T00:00:00.000Z") }
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.3.adm
similarity index 100%
copy from asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm
copy to asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.3.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.4.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.4.adm
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.4.adm
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.7.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.7.adm
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_http_feed/bad_http_feed.7.adm
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.10.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.10.adm
new file mode 100644
index 0000000..353400f
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.10.adm
@@ -0,0 +1,2 @@
+{ "tid": 0, "area_name": "OC", "text": "OC Tweet" }
+{ "tid": 2, "area_name": "OC", "text": "OC Tweet" }
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.4.adm
similarity index 100%
copy from asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm
copy to asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.4.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.6.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.6.adm
new file mode 100644
index 0000000..9dffebb
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.6.adm
@@ -0,0 +1 @@
+{ "tid": 0, "area_name": "OC", "text": "OC Tweet" }
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.8.adm
similarity index 100%
copy from asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm
copy to asterix-bad/src/test/resources/runtimets/results/bad_cq/bad_islands/bad_islands.8.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/bad_cq/new_tweets_from_area/new_tweets_from_area.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_cq/new_tweets_from_area/new_tweets_from_area.1.adm
new file mode 100644
index 0000000..23c8e2e
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_cq/new_tweets_from_area/new_tweets_from_area.1.adm
@@ -0,0 +1,4 @@
+{ "t": { "tid": 2, "area_name": "LA", "suspicious_level": 10, "text": "Tweet 3", "location": point("4037.165975321966,4020.6200896429373"), "timestamp": datetime("2018-08-14T00:00:00.000Z"), "threatening_flag": true }, "TimeCurrent": datetime("2020-08-18T05:03:42.096Z"), "TimePrevious": datetime("1970-01-01T00:00:00.000Z") }
+{ "t": { "tid": 5, "area_name": "LA", "suspicious_level": 8, "text": "Tweet 6", "location": point("10030.582330779562,10035.23466920704"), "timestamp": datetime("2017-04-11T00:00:00.000Z"), "threatening_flag": false }, "TimeCurrent": datetime("2020-08-18T05:03:42.096Z"), "TimePrevious": datetime("1970-01-01T00:00:00.000Z") }
+{ "t": { "tid": 6, "area_name": "LA", "suspicious_level": 9, "text": "Tweet 7", "location": point("12074.059527318483,12008.549148129303"), "timestamp": datetime("2017-04-23T00:00:00.000Z"), "threatening_flag": true }, "TimeCurrent": datetime("2020-08-18T05:03:42.096Z"), "TimePrevious": datetime("1970-01-01T00:00:00.000Z") }
+{ "t": { "tid": 8, "area_name": "LA", "suspicious_level": 8, "text": "Tweet 9", "location": point("16051.9846352692,16078.599078960015"), "timestamp": datetime("2018-03-27T00:00:00.000Z"), "threatening_flag": true }, "TimeCurrent": datetime("2020-08-18T05:03:42.096Z"), "TimePrevious": datetime("1970-01-01T00:00:00.000Z") }
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/add_index/add_index.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/add_index/add_index.1.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/add_index/add_index.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/add_index/add_index.1.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/create_channel_check_datasets/create_channel_check_datasets.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/create_channel_check_datasets/create_channel_check_datasets.1.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/create_channel_check_datasets/create_channel_check_datasets.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/create_channel_check_datasets/create_channel_check_datasets.1.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/create_channel_check_metadata/create_channel_check_metadata.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/create_channel_check_metadata/create_channel_check_metadata.1.adm
similarity index 73%
rename from asterix-bad/src/test/resources/runtimets/results/channel/create_channel_check_metadata/create_channel_check_metadata.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/create_channel_check_metadata/create_channel_check_metadata.1.adm
index bd1933c..0748789 100644
--- a/asterix-bad/src/test/resources/runtimets/results/channel/create_channel_check_metadata/create_channel_check_metadata.1.adm
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_rq/create_channel_check_metadata/create_channel_check_metadata.1.adm
@@ -1 +1 @@
-{ "DataverseName": "channels", "ChannelName": "nearbyTweetChannel", "SubscriptionsDatasetName": "nearbyTweetChannelSubscriptions", "ResultsDatasetName": "nearbyTweetChannelResults", "Function": [ "channels", "NearbyTweetsContainingText", "2" ], "Duration": "PT10M", "Dependencies": [ [ [ "channels", "nearbyTweetChannelResults" ], [ "channels", "nearbyTweetChannelSubscriptions" ] ], [ [ "channels", "NearbyTweetsContainingText", "2" ] ] ], "Body": "SET inline_with \"false\";\ninsert into `channels`.nearbyTweetChannelResults as a (\nwith channelExecutionTime as current_datetime() \nselect result, channelExecutionTime, sub.subscriptionId as subscriptionId,current_datetime() as deliveryTime\nfrom `channels`.nearbyTweetChannelSubscriptions sub,\nMetadata.Broker b, \nchannels.NearbyTweetsContainingText(sub.param0,sub.param1) result \nwhere b.BrokerName = sub.BrokerName\nand b.DataverseName = sub.DataverseName\n) returning a;" }
\ No newline at end of file
+{ "DataverseName": "channels", "ChannelName": "nearbyTweetChannel", "SubscriptionsDatasetName": "nearbyTweetChannelSubscriptions", "ResultsDatasetName": "nearbyTweetChannelResults", "Function": [ "channels", "NearbyTweetsContainingText", "2" ], "Duration": "PT10M", "Dependencies": [ [ [ "channels", "nearbyTweetChannelResults" ], [ "channels", "nearbyTweetChannelSubscriptions" ] ], [ [ "channels", "NearbyTweetsContainingText", "2" ] ] ], "Body": "SET inline_with \"false\";\ninsert into `channels`.nearbyTweetChannelResults as a (\nwith channelExecutionTime as current_datetime() \nselect result, channelExecutionTime, sub.subscriptionId as subscriptionId,current_datetime() as deliveryTime\nfrom `channels`.nearbyTweetChannelSubscriptions sub,\nMetadata.`Broker` b, \nchannels.NearbyTweetsContainingText(sub.param0, sub.param1) result \nwhere sub.BrokerName /*+ bcast */ = b.BrokerName\nand sub.DataverseName /*+ bcast */ = b.DataverseName\n) returning a;" }
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/disasters_with_friends/disasters_with_friends.5.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/disasters_with_friends/disasters_with_friends.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/disasters_with_friends/disasters_with_friends.5.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.1.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/drop_channel_check_datasets/drop_channel_check_datasets.1.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.1.adm
similarity index 72%
rename from asterix-bad/src/test/resources/runtimets/results/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.1.adm
index 5ec9e7c..7dcff54 100644
--- a/asterix-bad/src/test/resources/runtimets/results/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.adm
+++ b/asterix-bad/src/test/resources/runtimets/results/bad_rq/drop_channel_check_metadata/drop_channel_check_metadata.1.adm
@@ -1,2 +1,2 @@
-{ "DataverseName": "channels", "ChannelName": "nearbyTweetChannel1", "SubscriptionsDatasetName": "nearbyTweetChannel1Subscriptions", "ResultsDatasetName": "nearbyTweetChannel1Results", "Function": [ "channels", "NearbyTweetsContainingText", "2" ], "Duration": "PT10M", "Dependencies": [ [ [ "channels", "nearbyTweetChannel1Results" ], [ "channels", "nearbyTweetChannel1Subscriptions" ] ], [ [ "channels", "NearbyTweetsContainingText", "2" ] ] ], "Body": "SET inline_with \"false\";\ninsert into `channels`.nearbyTweetChannel1Results as a (\nwith channelExecutionTime as current_datetime() \nselect result, channelExecutionTime, sub.subscriptionId as subscriptionId,current_datetime() as deliveryTime\nfrom `channels`.nearbyTweetChannel1Subscriptions sub,\nMetadata.Broker b, \nchannels.NearbyTweetsContainingText(sub.param0,sub.param1) result \nwhere b.BrokerName = sub.BrokerName\nand b.DataverseName = sub.DataverseName\n) returning a;" }
-{ "DataverseName": "channels", "ChannelName": "nearbyTweetChannel3", "SubscriptionsDatasetName": "nearbyTweetChannel3Subscriptions", "ResultsDatasetName": "nearbyTweetChannel3Results", "Function": [ "channels", "NearbyTweetsContainingText", "2" ], "Duration": "PT10M", "Dependencies": [ [ [ "channels", "nearbyTweetChannel3Results" ], [ "channels", "nearbyTweetChannel3Subscriptions" ] ], [ [ "channels", "NearbyTweetsContainingText", "2" ] ] ], "Body": "SET inline_with \"false\";\ninsert into `channels`.nearbyTweetChannel3Results as a (\nwith channelExecutionTime as current_datetime() \nselect result, channelExecutionTime, sub.subscriptionId as subscriptionId,current_datetime() as deliveryTime\nfrom `channels`.nearbyTweetChannel3Subscriptions sub,\nMetadata.Broker b, \nchannels.NearbyTweetsContainingText(sub.param0,sub.param1) result \nwhere b.BrokerName = sub.BrokerName\nand b.DataverseName = sub.DataverseName\n) returning a;" }
\ No newline at end of file
+{ "DataverseName": "channels", "ChannelName": "nearbyTweetChannel1", "SubscriptionsDatasetName": "nearbyTweetChannel1Subscriptions", "ResultsDatasetName": "nearbyTweetChannel1Results", "Function": [ "channels", "NearbyTweetsContainingText", "2" ], "Duration": "PT10M", "Dependencies": [ [ [ "channels", "nearbyTweetChannel1Results" ], [ "channels", "nearbyTweetChannel1Subscriptions" ] ], [ [ "channels", "NearbyTweetsContainingText", "2" ] ] ], "Body": "SET inline_with \"false\";\ninsert into `channels`.nearbyTweetChannel1Results as a (\nwith channelExecutionTime as current_datetime() \nselect result, channelExecutionTime, sub.subscriptionId as subscriptionId,current_datetime() as deliveryTime\nfrom `channels`.nearbyTweetChannel1Subscriptions sub,\nMetadata.`Broker` b, \nchannels.NearbyTweetsContainingText(sub.param0, sub.param1) result \nwhere sub.BrokerName /*+ bcast */ = b.BrokerName\nand sub.DataverseName /*+ bcast */ = b.DataverseName\n) returning a;" }
+{ "DataverseName": "channels", "ChannelName": "nearbyTweetChannel3", "SubscriptionsDatasetName": "nearbyTweetChannel3Subscriptions", "ResultsDatasetName": "nearbyTweetChannel3Results", "Function": [ "channels", "NearbyTweetsContainingText", "2" ], "Duration": "PT10M", "Dependencies": [ [ [ "channels", "nearbyTweetChannel3Results" ], [ "channels", "nearbyTweetChannel3Subscriptions" ] ], [ [ "channels", "NearbyTweetsContainingText", "2" ] ] ], "Body": "SET inline_with \"false\";\ninsert into `channels`.nearbyTweetChannel3Results as a (\nwith channelExecutionTime as current_datetime() \nselect result, channelExecutionTime, sub.subscriptionId as subscriptionId,current_datetime() as deliveryTime\nfrom `channels`.nearbyTweetChannel3Subscriptions sub,\nMetadata.`Broker` b, \nchannels.NearbyTweetsContainingText(sub.param0, sub.param1) result \nwhere sub.BrokerName /*+ bcast */ = b.BrokerName\nand sub.DataverseName /*+ bcast */ = b.DataverseName\n) returning a;" }
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/room_occupants/room_occupants.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/room_occupants/room_occupants.1.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/room_occupants/room_occupants.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/room_occupants/room_occupants.1.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/room_occupants/room_occupants.2.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/room_occupants/room_occupants.2.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/room_occupants/room_occupants.2.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/room_occupants/room_occupants.2.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.adm
diff --git a/asterix-bad/src/test/resources/runtimets/results/channel/ten_minute_channel/ten_minute_channel.5.adm b/asterix-bad/src/test/resources/runtimets/results/bad_rq/ten_minute_channel/ten_minute_channel.5.adm
similarity index 100%
rename from asterix-bad/src/test/resources/runtimets/results/channel/ten_minute_channel/ten_minute_channel.5.adm
rename to asterix-bad/src/test/resources/runtimets/results/bad_rq/ten_minute_channel/ten_minute_channel.5.adm
diff --git a/asterix-bad/src/test/resources/runtimets/testsuite.xml b/asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
similarity index 77%
rename from asterix-bad/src/test/resources/runtimets/testsuite.xml
rename to asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
index 4640af1..5f130e9 100644
--- a/asterix-bad/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
@@ -20,7 +20,7 @@
              ResultOffsetPath="results"
              QueryOffsetPath="queries"
              QueryFileExtension=".sqlpp">
-  <test-group name="channel">
+  <test-group name="procedure">
     <test-case FilePath="procedure">
       <compilation-unit name="create_procedure_check_metadata">
         <output-dir compare="Text">create_procedure_check_metadata</output-dir>
@@ -103,80 +103,129 @@
         <output-dir compare="Text">repetitive_insert_procedure</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+  </test-group>
+  <test-group name="bad_rq">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="create_channel_check_datasets">
         <output-dir compare="Text">create_channel_check_datasets</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="create_channel_check_metadata">
         <output-dir compare="Text">create_channel_check_metadata</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_channel_check_datasets">
         <output-dir compare="Text">drop_channel_check_datasets</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_channel_check_metadata">
         <output-dir compare="Text">drop_channel_check_metadata</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="subscribe_channel_check_subscriptions">
         <output-dir compare="Text">subscribe_channel_check_subscriptions</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_function">
         <output-dir compare="Text">drop_function</output-dir>
         <expected-error>Cannot drop function channels.NearbyTweetsContainingText@2. two.nearbyTweetChannel(Channel) depends on it!</expected-error>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_index">
         <output-dir compare="Text">drop_index</output-dir>
         <expected-error>Cannot drop index. channels.EmergencyChannel(Channel) depends on it!</expected-error>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="add_index">
         <output-dir compare="Text">add_index</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_results">
         <output-dir compare="Text">drop_results</output-dir>
         <expected-error>Cannot alter dataset two.nearbyTweetChannelResults. two.nearbyTweetChannel(Channel) depends on it!</expected-error>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_subscriptions">
         <output-dir compare="Text">drop_subscriptions</output-dir>
         <expected-error>Cannot alter dataset two.nearbyTweetChannelSubscriptions. two.nearbyTweetChannel(Channel) depends on it!</expected-error>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="drop_function_dataverse">
         <output-dir compare="Text">drop_function_dataverse</output-dir>
         <expected-error>Cannot drop dataverse channels. two.nearbyTweetChannel(Channel) depends on it!</expected-error>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="room_occupants">
         <output-dir compare="Text">room_occupants</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="disasters_with_friends">
         <output-dir compare="Text">disasters_with_friends</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="channel">
+    <test-case FilePath="bad_rq">
       <compilation-unit name="ten_minute_channel">
         <output-dir compare="Text">ten_minute_channel</output-dir>
       </compilation-unit>
     </test-case>
   </test-group>
+  <test-group name="bad_cq">
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="active_dataset_insert">
+        <output-dir compare="Text">active_dataset_insert</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="active_dataset_upsert">
+        <output-dir compare="Text">active_dataset_upsert</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="active_dataset_delete">
+        <output-dir compare="Text">active_dataset_delete</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="active_feeds">
+        <output-dir compare="Text">active_feeds</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="active_function_in_udf">
+        <output-dir compare="Text">active_function_in_udf</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="active_functions">
+        <output-dir compare="Text">active_functions</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="bad_http_feed">
+        <output-dir compare="Text">bad_http_feed</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="bad_islands">
+        <output-dir compare="Text">bad_islands</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="bad_cq">
+      <compilation-unit name="new_tweets_from_area">
+        <output-dir compare="Text">new_tweets_from_area</output-dir>
+      </compilation-unit>
+    </test-case>
+  </test-group>
 </test-suite>