diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.1.ddl.aql
index 0a0945e..f05a169 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.1.ddl.aql
@@ -2,7 +2,6 @@
 create dataverse test;
 use dataverse test;
 
-
 create type AddressType as open {
   number: int32, 
   street: string,
@@ -22,10 +21,3 @@
 create external dataset Customers(CustomerType) 
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/semistructured/tiny01/customer.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_count-nullable.adm";
-
-for $c in dataset('Customers')
-group by $age := $c.age with $c
-order by $age
-return { "custage": $age, "count": count($c) }
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.2.update.aql
index 0a0945e..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.2.update.aql
@@ -1,31 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-
-create type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-
-create external dataset Customers(CustomerType) 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/semistructured/tiny01/customer.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_count-nullable.adm";
-
-for $c in dataset('Customers')
-group by $age := $c.age with $c
-order by $age
-return { "custage": $age, "count": count($c) }
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.3.query.aql
index 0a0945e..f86b3ba 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/count-nullable/count-nullable.3.query.aql
@@ -1,30 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-
-create type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-
-create external dataset Customers(CustomerType) 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/semistructured/tiny01/customer.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_count-nullable.adm";
-
 for $c in dataset('Customers')
 group by $age := $c.age with $c
 order by $age
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.1.ddl.aql
index e2ab245..344c27f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.1.ddl.aql
@@ -2,7 +2,6 @@
 create dataverse test;
 use dataverse test;
 
-
 create type AddressType as open {
   number: int32, 
   street: string,
@@ -21,10 +20,3 @@
 create external dataset Customers(CustomerType) 
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/semistructured/tiny01/customer.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_cust-filter.adm";
-
-for $c in dataset('Customers')
-where $c.age < 21 
-order by $c.cid
-return { "custname":$c.name, "custage": $c.age }
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.2.update.aql
index e2ab245..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.2.update.aql
@@ -1,30 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-
-create type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create external dataset Customers(CustomerType) 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/semistructured/tiny01/customer.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_cust-filter.adm";
-
-for $c in dataset('Customers')
-where $c.age < 21 
-order by $c.cid
-return { "custname":$c.name, "custage": $c.age }
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.3.query.aql
index e2ab245..68d45fe 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/cust-filter/cust-filter.3.query.aql
@@ -1,29 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-
-create type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create external dataset Customers(CustomerType) 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/semistructured/tiny01/customer.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_cust-filter.adm";
-
 for $c in dataset('Customers')
 where $c.age < 21 
 order by $c.cid
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.1.ddl.aql
index 930e83d..477989e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.1.ddl.aql
@@ -14,10 +14,3 @@
 create external dataset Orders(OrderType)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/semistructured/tiny01/orders.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_has-param1.adm";
-
-for $o in dataset('Orders')
-where not(is-null($o.param1))
-order by $o.oid 
-return $o
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.2.update.aql
index 930e83d..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.2.update.aql
@@ -1,23 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create external dataset Orders(OrderType)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/semistructured/tiny01/orders.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_has-param1.adm";
-
-for $o in dataset('Orders')
-where not(is-null($o.param1))
-order by $o.oid 
-return $o
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.3.query.aql
index 930e83d..4247586 100644
--- a/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/semistructured/has-param1/has-param1.3.query.aql
@@ -1,22 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create external dataset Orders(OrderType)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/semistructured/tiny01/orders.adm"),("format"="adm"));
-
-write output to nc1:"rttest/semistructured_has-param1.adm";
-
 for $o in dataset('Orders')
 where not(is-null($o.param1))
 order by $o.oid 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.aql
index 81b8bd2..11258d6 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.aql
@@ -15,27 +15,4 @@
 create dataset TwitterData(Tweet)
   primary key id on group1;
 
-
-load dataset TwitterData 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/twitter/extrasmalltweets.txt"),("format"="adm")) pre-sorted;
-
 create index rtree_index_point on TwitterData(loc) type rtree;
-
-write output to nc1:"rttest/spatial_cell-aggregation-with-filtering.adm";
-
-for $t in dataset('TwitterData')
-let $keyword := "Allergies"
-let $region := polygon("
-	33.80503407287759,-126.41235263538363 
-	44.9090773200516,-126.41235263538363 
-	44.9090773200516,-87.65258701038363 
-	33.80503407287759,-87.65258701038363")
-
-where spatial-intersect($t.loc, $region)  and
-$t.time > datetime("2011-05-15T00:00:00Z") and $t.time < datetime("2011-05-16T23:59:59Z") and
-contains($t.text, $keyword)
-group by $c := spatial-cell($t.loc, create-point(24.5,-125.5), 3.0, 3.0) with $t
-let $num :=  count($t)
-order by $num
-return { "cell": $c, "count": $num }
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.2.update.aql
index 81b8bd2..f958d75 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.2.update.aql
@@ -1,41 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type Tweet as closed {
-	id: int32,
-	tweetid: int64,
-	loc: point,
-	time: datetime,
-	text: string
-}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
-create dataset TwitterData(Tweet)
-  primary key id on group1;
-
-
 load dataset TwitterData 
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/twitter/extrasmalltweets.txt"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on TwitterData(loc) type rtree;
-
-write output to nc1:"rttest/spatial_cell-aggregation-with-filtering.adm";
-
-for $t in dataset('TwitterData')
-let $keyword := "Allergies"
-let $region := polygon("
-	33.80503407287759,-126.41235263538363 
-	44.9090773200516,-126.41235263538363 
-	44.9090773200516,-87.65258701038363 
-	33.80503407287759,-87.65258701038363")
-
-where spatial-intersect($t.loc, $region)  and
-$t.time > datetime("2011-05-15T00:00:00Z") and $t.time < datetime("2011-05-16T23:59:59Z") and
-contains($t.text, $keyword)
-group by $c := spatial-cell($t.loc, create-point(24.5,-125.5), 3.0, 3.0) with $t
-let $num :=  count($t)
-order by $num
-return { "cell": $c, "count": $num }
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.aql
index 81b8bd2..9358c18 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.aql
@@ -1,29 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type Tweet as closed {
-	id: int32,
-	tweetid: int64,
-	loc: point,
-	time: datetime,
-	text: string
-}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
-create dataset TwitterData(Tweet)
-  primary key id on group1;
-
-
-load dataset TwitterData 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/twitter/extrasmalltweets.txt"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on TwitterData(loc) type rtree;
-
-write output to nc1:"rttest/spatial_cell-aggregation-with-filtering.adm";
-
 for $t in dataset('TwitterData')
 let $keyword := "Allergies"
 let $region := polygon("
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.1.ddl.aql
index 44ad6ea..ef981bb 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.1.ddl.aql
@@ -10,14 +10,3 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialDataAggregation.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_cell-aggregation.adm";
-
-let $grid :=
-for $o in dataset('MyData')
-group by $c := spatial-cell($o.loc, create-point(0.0,0.0), 5.0, 5.0) with $o
-let $num :=  count($o)
-order by $num
-return { "cell": $c, "count": $num}
-for $g in $grid
-return $g
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.2.update.aql
index 44ad6ea..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.2.update.aql
@@ -1,23 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  loc: point
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialDataAggregation.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_cell-aggregation.adm";
-
-let $grid :=
-for $o in dataset('MyData')
-group by $c := spatial-cell($o.loc, create-point(0.0,0.0), 5.0, 5.0) with $o
-let $num :=  count($o)
-order by $num
-return { "cell": $c, "count": $num}
-for $g in $grid
-return $g
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.3.query.aql
index 44ad6ea..ecec58d 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/cell-aggregation/cell-aggregation.3.query.aql
@@ -1,18 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  loc: point
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialDataAggregation.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_cell-aggregation.adm";
-
 let $grid :=
 for $o in dataset('MyData')
 group by $c := spatial-cell($o.loc, create-point(0.0,0.0), 5.0, 5.0) with $o
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.aql
index 6018671..e123144 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.aql
@@ -11,11 +11,3 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_circle-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect(create-circle(create-point(0.0,0.0), 5.0), create-circle(create-point(9.9,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.2.update.aql
index 6018671..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_circle-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect(create-circle(create-point(0.0,0.0), 5.0), create-circle(create-point(9.9,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.3.query.aql
index 6018671..e318dbc 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/circle-intersect-circle/circle-intersect-circle.3.query.aql
@@ -1,21 +1,6 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_circle-intersect-circle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect(create-circle(create-point(0.0,0.0), 5.0), create-circle(create-point(9.9,0.0), 5.0))
 order by $o.id
 return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.1.ddl.aql
index 1d48ebd..e6e10a3 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.1.ddl.aql
@@ -6,9 +6,4 @@
 
 drop dataverse test if exists;
 create dataverse test;
-use dataverse test;
 
-write output to nc1:"rttest/spatial_circle_accessor.adm";
-
-let $circle := create-circle(create-point(6.0,3.0), 1.0)
-return {"circle-radius": get-radius($circle), "circle-center": get-center($circle)}
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.2.update.aql
index 1d48ebd..c978b14 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.2.update.aql
@@ -3,12 +3,4 @@
  * Expected Result  :   Success
  * Date             :   Oct 17, 2012
  */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_circle_accessor.adm";
-
-let $circle := create-circle(create-point(6.0,3.0), 1.0)
-return {"circle-radius": get-radius($circle), "circle-center": get-center($circle)}
\ No newline at end of file
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.3.query.aql
index 1d48ebd..3e217c6 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/circle_accessor/circle_accessor.3.query.aql
@@ -4,11 +4,7 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-write output to nc1:"rttest/spatial_circle_accessor.adm";
-
 let $circle := create-circle(create-point(6.0,3.0), 1.0)
-return {"circle-radius": get-radius($circle), "circle-center": get-center($circle)}
\ No newline at end of file
+return {"circle-radius": get-radius($circle), "circle-center": get-center($circle)}
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.1.ddl.aql
index 3fe1355..cc8c544 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.1.ddl.aql
@@ -3,7 +3,6 @@
  * Success        : Yes
  */
 
-
 drop dataverse test if exists;
 create dataverse test;
 use dataverse test;
@@ -24,11 +23,3 @@
 create index rtree_index5 on MyData(rec) type rtree;
 create index rtree_index4 on MyData(circle) type rtree;
 
-write output to nc1:"rttest/spatial_create-rtree-index.adm";
-
-load dataset MyData 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-for $a in dataset('MyData')
-return $a.id
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.2.update.aql
index 3fe1355..264e49b 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.2.update.aql
@@ -3,32 +3,8 @@
  * Success        : Yes
  */
 
-
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type SpatialType as open {
-  id: int32,
-  point: point,
-  line1: line,
-  poly1: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(SpatialType) primary key id;
-create index rtree_index1 on MyData(point) type rtree;
-create index rtree_index2 on MyData(line1) type rtree;
-create index rtree_index3 on MyData(poly1) type rtree;
-create index rtree_index5 on MyData(rec) type rtree;
-create index rtree_index4 on MyData(circle) type rtree;
-
-write output to nc1:"rttest/spatial_create-rtree-index.adm";
-
 load dataset MyData 
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-for $a in dataset('MyData')
-return $a.id
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.3.query.aql
index 3fe1355..53b1c30 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/create-rtree-index/create-rtree-index.3.query.aql
@@ -3,32 +3,7 @@
  * Success        : Yes
  */
 
-
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type SpatialType as open {
-  id: int32,
-  point: point,
-  line1: line,
-  poly1: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(SpatialType) primary key id;
-create index rtree_index1 on MyData(point) type rtree;
-create index rtree_index2 on MyData(line1) type rtree;
-create index rtree_index3 on MyData(poly1) type rtree;
-create index rtree_index5 on MyData(rec) type rtree;
-create index rtree_index4 on MyData(circle) type rtree;
-
-write output to nc1:"rttest/spatial_create-rtree-index.adm";
-
-load dataset MyData 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
 for $a in dataset('MyData')
-return $a.id
\ No newline at end of file
+return $a.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.1.ddl.aql
index c02eba2..e123144 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.1.ddl.aql
@@ -11,11 +11,3 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_distance-between-points.adm";
-
-for $o in dataset('MyData')
-let $distance := spatial-distance($o.point, create-point(0.0, 0.0))
-order by $o.id
-return {"id":$o.id, "distance":$distance}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.2.update.aql
index c02eba2..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_distance-between-points.adm";
-
-for $o in dataset('MyData')
-let $distance := spatial-distance($o.point, create-point(0.0, 0.0))
-order by $o.id
-return {"id":$o.id, "distance":$distance}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.3.query.aql
index c02eba2..9095224 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/distance-between-points/distance-between-points.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_distance-between-points.adm";
-
 for $o in dataset('MyData')
 let $distance := spatial-distance($o.point, create-point(0.0, 0.0))
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.1.ddl.aql
deleted file mode 100644
index 035ec63..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.1.ddl.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, create-circle(create-point(0.0,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.2.update.aql
deleted file mode 100644
index 035ec63..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.2.update.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, create-circle(create-point(0.0,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.3.query.aql
deleted file mode 100644
index 035ec63..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-circle/ine-intersect-circle.3.query.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, create-circle(create-point(0.0,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.1.ddl.aql
deleted file mode 100644
index e844030..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.1.ddl.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-line.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.line2)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.2.update.aql
deleted file mode 100644
index e844030..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.2.update.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-line.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.line2)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.3.query.aql
deleted file mode 100644
index e844030..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-line/ine-intersect-line.3.query.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-line.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.line2)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.1.ddl.aql
deleted file mode 100644
index 7ed8e25..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.1.ddl.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.poly1)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.2.update.aql
deleted file mode 100644
index 7ed8e25..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.2.update.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.poly1)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.3.query.aql
deleted file mode 100644
index 7ed8e25..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-polygon/ine-intersect-polygon.3.query.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.poly1)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.1.ddl.aql
deleted file mode 100644
index 940f5c4..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.1.ddl.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-  using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-  (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.2.update.aql
deleted file mode 100644
index 940f5c4..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.2.update.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-  using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-  (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.3.query.aql
deleted file mode 100644
index 940f5c4..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine-intersect-rectangle/ine-intersect-rectangle.3.query.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-  using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-  (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_line-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.line1, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.1.ddl.aql
deleted file mode 100644
index 2085436..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.1.ddl.aql
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Description      :   Test spatial accessors
- * Expected Result  :   Success
- * Date             :   Oct 17, 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_line_accessor.adm";
-
-let $line := create-line(create-point(100.6,999.4), create-point(-872.0,-876.9))
-let $line_list := get-points($line)
-for $p in $line_list
-return $p
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.2.update.aql
deleted file mode 100644
index 2085436..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.2.update.aql
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Description      :   Test spatial accessors
- * Expected Result  :   Success
- * Date             :   Oct 17, 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_line_accessor.adm";
-
-let $line := create-line(create-point(100.6,999.4), create-point(-872.0,-876.9))
-let $line_list := get-points($line)
-for $p in $line_list
-return $p
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.3.query.aql
deleted file mode 100644
index 2085436..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/ine_accessor/ine_accessor.3.query.aql
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Description      :   Test spatial accessors
- * Expected Result  :   Success
- * Date             :   Oct 17, 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_line_accessor.adm";
-
-let $line := create-line(create-point(100.6,999.4), create-point(-872.0,-876.9))
-let $line_list := get-points($line)
-for $p in $line_list
-return $p
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.1.ddl.aql
index 90d488f..1914a96 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.1.ddl.aql
@@ -12,10 +12,3 @@
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
 
-write output to nc1:"rttest/spatial_point-equals-point.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-point(5.0,1.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.2.update.aql
index 90d488f..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-equals-point.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-point(5.0,1.0))
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.3.query.aql
index 90d488f..e4e1fcd 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-equals-point/point-equals-point.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-equals-point.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.point, create-point(5.0,1.0))
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.1.ddl.aql
index 9f9e451..7e614c8 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.1.ddl.aql
@@ -11,11 +11,4 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-circle(create-point(0.0,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
  
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.2.update.aql
index 9f9e451..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-circle(create-point(0.0,0.0), 5.0))
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.3.query.aql
index 9f9e451..bcbad2a 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-circle/point-in-circle.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-circle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.point, create-circle(create-point(0.0,0.0), 5.0))
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.1.ddl.aql
index c239185..7e614c8 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.1.ddl.aql
@@ -11,11 +11,4 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $o.poly1)
-order by $o.id
-return {"id":$o.id}
  
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.2.update.aql
index c239185..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $o.poly1)
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.3.query.aql
index c239185..e5aada0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-polygon/point-in-polygon.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-polygon.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.point, $o.poly1)
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.1.ddl.aql
index 86d3dd9..1914a96 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.1.ddl.aql
@@ -12,10 +12,3 @@
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
 
-write output to nc1:"rttest/spatial_point-in-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.2.update.aql
index 86d3dd9..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.3.query.aql
index 86d3dd9..b5d11f7 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-in-rectangle/point-in-rectangle.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-in-rectangle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.point, $o.rec)
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.1.ddl.aql
index 66908b8..e123144 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.1.ddl.aql
@@ -11,11 +11,3 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-on-line.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $o.line1)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.2.update.aql
index 66908b8..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-on-line.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $o.line1)
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.3.query.aql
index 66908b8..514dc69 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point-on-line/point-on-line.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_point-on-line.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.point, $o.line1)
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.1.ddl.aql
index c408630..febae58 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.1.ddl.aql
@@ -6,9 +6,3 @@
 
 drop dataverse test if exists;
 create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_point_accessor.adm";
-
-let $point := create-point(2.3,5.0)
-return {"x-coordinate": get-x($point), "y-coordinate": get-y($point)}
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.2.update.aql
index c408630..e4f7747 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.2.update.aql
@@ -4,11 +4,4 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_point_accessor.adm";
-
-let $point := create-point(2.3,5.0)
-return {"x-coordinate": get-x($point), "y-coordinate": get-y($point)}
\ No newline at end of file
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.3.query.aql
index c408630..db136d9 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/point_accessor/point_accessor.3.query.aql
@@ -4,11 +4,7 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-write output to nc1:"rttest/spatial_point_accessor.adm";
-
 let $point := create-point(2.3,5.0)
-return {"x-coordinate": get-x($point), "y-coordinate": get-y($point)}
\ No newline at end of file
+return {"x-coordinate": get-x($point), "y-coordinate": get-y($point)}
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.aql
index acd29a8..1914a96 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.aql
@@ -12,10 +12,3 @@
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
 
-write output to nc1:"rttest/spatial_polygon-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.poly1, create-circle(create-point(6.0,3.0), 1.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.2.update.aql
index acd29a8..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.poly1, create-circle(create-point(6.0,3.0), 1.0))
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.3.query.aql
index acd29a8..2b066b0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-circle/polygon-intersect-circle.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-circle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.poly1, create-circle(create-point(6.0,3.0), 1.0))
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.aql
index 2a14dbd..e123144 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.aql
@@ -11,11 +11,3 @@
 create external dataset MyData(MyRecord)
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.poly1, $o.poly2)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.2.update.aql
index 2a14dbd..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-polygon.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.poly1, $o.poly2)
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.query.aql
index 2a14dbd..0f6bc82 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-polygon.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.poly1, $o.poly2)
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.aql
index 16bb5a1..1914a96 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.aql
@@ -12,10 +12,3 @@
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
 
-write output to nc1:"rttest/spatial_polygon-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.poly1, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.2.update.aql
index 16bb5a1..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.poly1, $o.rec)
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.query.aql
index 16bb5a1..5cf1c85 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_polygon-intersect-rectangle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.poly1, $o.rec)
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.1.ddl.aql
index a181648..e6e10a3 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.1.ddl.aql
@@ -6,11 +6,4 @@
 
 drop dataverse test if exists;
 create dataverse test;
-use dataverse test;
 
-write output to nc1:"rttest/spatial_polygon_accessor.adm";
-
-let $polygon := create-polygon(create-point(1.0,1.0), create-point(2.0,2.0), create-point(3.0,3.0), create-point(4.0,4.0))
-let $polygon_list := get-points($polygon)
-for $p in $polygon_list
-return $p
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.2.update.aql
index a181648..e4f7747 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.2.update.aql
@@ -4,13 +4,4 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_polygon_accessor.adm";
-
-let $polygon := create-polygon(create-point(1.0,1.0), create-point(2.0,2.0), create-point(3.0,3.0), create-point(4.0,4.0))
-let $polygon_list := get-points($polygon)
-for $p in $polygon_list
-return $p
\ No newline at end of file
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.3.query.aql
index a181648..54ccf92 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/polygon_accessor/polygon_accessor.3.query.aql
@@ -4,13 +4,9 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-write output to nc1:"rttest/spatial_polygon_accessor.adm";
-
 let $polygon := create-polygon(create-point(1.0,1.0), create-point(2.0,2.0), create-point(3.0,3.0), create-point(4.0,4.0))
 let $polygon_list := get-points($polygon)
 for $p in $polygon_list
-return $p
\ No newline at end of file
+return $p
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.aql
index 4f7c004..1914a96 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.aql
@@ -12,10 +12,3 @@
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
 
-write output to nc1:"rttest/spatial_rectangle-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.rec, create-circle(create-point(4.1,4.1), 1.0))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.2.update.aql
index 4f7c004..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_rectangle-intersect-circle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.rec, create-circle(create-point(4.1,4.1), 1.0))
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.query.aql
index 4f7c004..e5ecf77 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_rectangle-intersect-circle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.rec, create-circle(create-point(4.1,4.1), 1.0))
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.aql
index b32b6a3..1914a96 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.aql
@@ -12,10 +12,3 @@
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
 
-write output to nc1:"rttest/spatial_rectangle-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.rec, create-rectangle(create-point(4.5,9.0), create-point(-1.0,5.0)))
-order by $o.id
-return {"id":$o.id}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.2.update.aql
index b32b6a3..bb883a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.2.update.aql
@@ -1,21 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_rectangle-intersect-rectangle.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.rec, create-rectangle(create-point(4.5,9.0), create-point(-1.0,5.0)))
-order by $o.id
-return {"id":$o.id}
- 
+// no inserts, deletes 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.query.aql
index b32b6a3..4691341 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.query.aql
@@ -1,19 +1,5 @@
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_rectangle-intersect-rectangle.adm";
-
 for $o in dataset('MyData')
 where spatial-intersect($o.rec, create-rectangle(create-point(4.5,9.0), create-point(-1.0,5.0)))
 order by $o.id
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.1.ddl.aql
index 676888c..e6e10a3 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.1.ddl.aql
@@ -6,11 +6,4 @@
 
 drop dataverse test if exists;
 create dataverse test;
-use dataverse test;
 
-write output to nc1:"rttest/spatial_rectangle_accessor.adm";
-
-let $rectangle := create-rectangle(create-point(9.2,49.0), create-point(77.8,111.1))
-let $rectangle_list := get-points($rectangle)
-for $p in $rectangle_list
-return $p
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.2.update.aql
index 676888c..e4f7747 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.2.update.aql
@@ -4,13 +4,4 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to nc1:"rttest/spatial_rectangle_accessor.adm";
-
-let $rectangle := create-rectangle(create-point(9.2,49.0), create-point(77.8,111.1))
-let $rectangle_list := get-points($rectangle)
-for $p in $rectangle_list
-return $p
\ No newline at end of file
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.3.query.aql
index 676888c..98df270 100644
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/spatial/rectangle_accessor/rectangle_accessor.3.query.aql
@@ -4,13 +4,9 @@
  * Date             :   Oct 17, 2012
  */
 
-drop dataverse test if exists;
-create dataverse test;
 use dataverse test;
 
-write output to nc1:"rttest/spatial_rectangle_accessor.adm";
-
 let $rectangle := create-rectangle(create-point(9.2,49.0), create-point(77.8,111.1))
 let $rectangle_list := get-points($rectangle)
 for $p in $rectangle_list
-return $p
\ No newline at end of file
+return $p
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.1.ddl.aql
deleted file mode 100644
index 7f6c0b7..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.1.ddl.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_spatial-area.adm";
-
-let $polygonArea := spatial-area(create-polygon(create-point(1.0,1.0),create-point(1.0,4.0),create-point(3.0,4.0),create-point(3.0,1.0)))
-let $circleArea := spatial-area(create-circle(create-point(0.0,0.0), 1.0))
-let $rectangleArea := spatial-area(create-rectangle(create-point(0.0,5.0), create-point(8.0,8.0)))
-return {"polygonArea":$polygonArea, "circleArea":$circleArea, "rectangleArea":$rectangleArea}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.2.update.aql
deleted file mode 100644
index 7f6c0b7..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.2.update.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_spatial-area.adm";
-
-let $polygonArea := spatial-area(create-polygon(create-point(1.0,1.0),create-point(1.0,4.0),create-point(3.0,4.0),create-point(3.0,1.0)))
-let $circleArea := spatial-area(create-circle(create-point(0.0,0.0), 1.0))
-let $rectangleArea := spatial-area(create-rectangle(create-point(0.0,5.0), create-point(8.0,8.0)))
-return {"polygonArea":$polygonArea, "circleArea":$circleArea, "rectangleArea":$rectangleArea}
- 
diff --git a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.3.query.aql
deleted file mode 100644
index 7f6c0b7..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/spatial/spatial-are/spatial-are.3.query.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-create external dataset MyData(MyRecord)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm"));
-
-write output to nc1:"rttest/spatial_spatial-area.adm";
-
-let $polygonArea := spatial-area(create-polygon(create-point(1.0,1.0),create-point(1.0,4.0),create-point(3.0,4.0),create-point(3.0,1.0)))
-let $circleArea := spatial-area(create-circle(create-point(0.0,0.0), 1.0))
-let $rectangleArea := spatial-area(create-rectangle(create-point(0.0,5.0), create-point(8.0,8.0)))
-return {"polygonArea":$polygonArea, "circleArea":$circleArea, "rectangleArea":$rectangleArea}
-