[NO ISSUE][FUN] Remove AST tests for statistical functions - user model changes: no - storage format changes: no - interface changes: no Details: - Remove AST tests for statistical functions Change-Id: Ided329f38df568a32d2e8bca8f6125c23c04a07b Reviewed-on: https://asterix-gerrit.ics.uci.edu/3279 Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mblow@apache.org>

commit: 24caa67712f78b763887d884263f994a0078a101 [log] [tgz]
author: Dmitry Lychagin <dmitry.lychagin@couchbase.com> Fri Mar 15 15:50:34 2019 -0700
committer: Dmitry Lychagin <dmitry.lychagin@couchbase.com> Mon Mar 18 11:14:20 2019 -0700
tree: 7b750113563a39a235566141cd0eefdcb5965617
parent: e5ea42db0f0b0925db7da7b11e998e8c9733b9f5 [diff]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double/kurtosis_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double/kurtosis_double.1.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double/kurtosis_double.1.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double/kurtosis_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double/kurtosis_double.3.ast
deleted file mode 100644
index 2921b94..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double/kurtosis_double.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [DOUBLE] [1.0]
-        LiteralExpr [DOUBLE] [2.0]
-        FunctionCall null.double@1[
-          LiteralExpr [STRING] [3.0]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double_null/kurtosis_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double_null/kurtosis_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double_null/kurtosis_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double_null/kurtosis_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double_null/kurtosis_double_null.3.ast
deleted file mode 100644
index ba248e3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_double_null/kurtosis_double_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.sql-kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_01/kurtosis_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_01/kurtosis_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_01/kurtosis_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_01/kurtosis_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_01/kurtosis_empty_01.3.ast
deleted file mode 100644
index 9ad473f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_01/kurtosis_empty_01.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [LONG] [1]
-        LiteralExpr [LONG] [2]
-        LiteralExpr [LONG] [3]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-    Where
-      OperatorExpr [
-        Variable [ Name=$x ]
-        >
-        LiteralExpr [LONG] [10]
-      ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_02/kurtosis_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_02/kurtosis_empty_02.1.ast
deleted file mode 100644
index baf977e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_02/kurtosis_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_02/kurtosis_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_02/kurtosis_empty_02.3.ast
deleted file mode 100644
index 091578a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_empty_02/kurtosis_empty_02.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=val
-    ]
-    ]
-    FROM [      FunctionCall asterix.dataset@1[
-        LiteralExpr [STRING] [test.Test]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float/kurtosis_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float/kurtosis_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float/kurtosis_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float/kurtosis_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float/kurtosis_float.3.ast
deleted file mode 100644
index 4256f27..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float/kurtosis_float.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float_null/kurtosis_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float_null/kurtosis_float_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float_null/kurtosis_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float_null/kurtosis_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float_null/kurtosis_float_null.3.ast
deleted file mode 100644
index 0296417..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_float_null/kurtosis_float_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.sql-kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16/kurtosis_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16/kurtosis_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16/kurtosis_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16/kurtosis_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16/kurtosis_int16.3.ast
deleted file mode 100644
index 34b8b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16/kurtosis_int16.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16_null/kurtosis_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16_null/kurtosis_int16_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16_null/kurtosis_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16_null/kurtosis_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16_null/kurtosis_int16_null.3.ast
deleted file mode 100644
index 6d5d6f6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int16_null/kurtosis_int16_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.sql-kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32/kurtosis_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32/kurtosis_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32/kurtosis_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32/kurtosis_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32/kurtosis_int32.3.ast
deleted file mode 100644
index 1edafeb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32/kurtosis_int32.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int32@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int32@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int32@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32_null/kurtosis_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32_null/kurtosis_int32_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32_null/kurtosis_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32_null/kurtosis_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32_null/kurtosis_int32_null.3.ast
deleted file mode 100644
index 0f9aacb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int32_null/kurtosis_int32_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.sql-kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64/kurtosis_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64/kurtosis_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64/kurtosis_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64/kurtosis_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64/kurtosis_int64.3.ast
deleted file mode 100644
index fa95d6f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64/kurtosis_int64.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64_null/kurtosis_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64_null/kurtosis_int64_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64_null/kurtosis_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64_null/kurtosis_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64_null/kurtosis_int64_null.3.ast
deleted file mode 100644
index f7d0f57..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int64_null/kurtosis_int64_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.sql-kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8/kurtosis_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8/kurtosis_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8/kurtosis_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8/kurtosis_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8/kurtosis_int8.3.ast
deleted file mode 100644
index 0c2ded8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8/kurtosis_int8.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8_null/kurtosis_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8_null/kurtosis_int8_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8_null/kurtosis_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8_null/kurtosis_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8_null/kurtosis_int8_null.3.ast
deleted file mode 100644
index 8b79a50..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_int8_null/kurtosis_int8_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.sql-kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_mixed/kurtosis_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_mixed/kurtosis_mixed.3.ast
deleted file mode 100644
index d9571bd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/kurtosis_mixed/kurtosis_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis/scalar_kurtosis.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis/scalar_kurtosis.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis/scalar_kurtosis.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis/scalar_kurtosis.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis/scalar_kurtosis.3.ast
deleted file mode 100644
index 4cb2969..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis/scalar_kurtosis.3.ast
+++ /dev/null

@@ -1,105 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_empty/scalar_kurtosis_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_empty/scalar_kurtosis_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_empty/scalar_kurtosis_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_empty/scalar_kurtosis_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_empty/scalar_kurtosis_empty.3.ast
deleted file mode 100644
index 77a7650..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_empty/scalar_kurtosis_empty.3.ast
+++ /dev/null

@@ -1,7 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-kurtosis@1[
-  OrderedListConstructor [
-  ]
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_null/scalar_kurtosis_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_null/scalar_kurtosis_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_null/scalar_kurtosis_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_null/scalar_kurtosis_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_null/scalar_kurtosis_null.3.ast
deleted file mode 100644
index cf5de4c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_kurtosis_null/scalar_kurtosis_null.3.ast
+++ /dev/null

@@ -1,111 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.sql-kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness/scalar_skewness.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness/scalar_skewness.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness/scalar_skewness.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness/scalar_skewness.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness/scalar_skewness.3.ast
deleted file mode 100644
index c500b17..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness/scalar_skewness.3.ast
+++ /dev/null

@@ -1,105 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_empty/scalar_skewness_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_empty/scalar_skewness_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_empty/scalar_skewness_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_empty/scalar_skewness_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_empty/scalar_skewness_empty.3.ast
deleted file mode 100644
index a869913..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_empty/scalar_skewness_empty.3.ast
+++ /dev/null

@@ -1,7 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  OrderedListConstructor [
-  ]
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_null/scalar_skewness_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_null/scalar_skewness_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_null/scalar_skewness_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_null/scalar_skewness_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_null/scalar_skewness_null.3.ast
deleted file mode 100644
index d3fd744..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_skewness_null/scalar_skewness_null.3.ast
+++ /dev/null

@@ -1,111 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.sql-skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev/scalar_stddev.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev/scalar_stddev.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev/scalar_stddev.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev/scalar_stddev.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev/scalar_stddev.3.ast
deleted file mode 100644
index 0c5206c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev/scalar_stddev.3.ast
+++ /dev/null

@@ -1,222 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_empty/scalar_stddev_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_empty/scalar_stddev_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_empty/scalar_stddev_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_empty/scalar_stddev_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_empty/scalar_stddev_empty.3.ast
deleted file mode 100644
index c12ee45..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_empty/scalar_stddev_empty.3.ast
+++ /dev/null

@@ -1,27 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_null/scalar_stddev_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_null/scalar_stddev_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_null/scalar_stddev_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_null/scalar_stddev_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_null/scalar_stddev_null.3.ast
deleted file mode 100644
index 0c4e2b9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_stddev_null/scalar_stddev_null.3.ast
+++ /dev/null

@@ -1,234 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var/scalar_var.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var/scalar_var.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var/scalar_var.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var/scalar_var.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var/scalar_var.3.ast
deleted file mode 100644
index 190da47..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var/scalar_var.3.ast
+++ /dev/null

@@ -1,222 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_empty/scalar_var_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_empty/scalar_var_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_empty/scalar_var_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_empty/scalar_var_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_empty/scalar_var_empty.3.ast
deleted file mode 100644
index 43e6f6c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_empty/scalar_var_empty.3.ast
+++ /dev/null

@@ -1,27 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_null/scalar_var_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_null/scalar_var_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_null/scalar_var_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_null/scalar_var_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_null/scalar_var_null.3.ast
deleted file mode 100644
index 09ace81..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_var_null/scalar_var_null.3.ast
+++ /dev/null

@@ -1,234 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.sql-var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double/serial_kurtosis_double.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.3.ast
deleted file mode 100644
index 367ea53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_double_null/serial_kurtosis_double_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_empty/serial_kurtosis_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_empty/serial_kurtosis_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_empty/serial_kurtosis_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_empty/serial_kurtosis_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_empty/serial_kurtosis_empty.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_empty/serial_kurtosis_empty.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float/serial_kurtosis_float.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.3.ast
deleted file mode 100644
index 367ea53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_float_null/serial_kurtosis_float_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16/serial_kurtosis_int16.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.3.ast
deleted file mode 100644
index 367ea53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int16_null/serial_kurtosis_int16_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32/serial_kurtosis_int32.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.3.ast
deleted file mode 100644
index 367ea53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int32_null/serial_kurtosis_int32_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64/serial_kurtosis_int64.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.3.ast
deleted file mode 100644
index 367ea53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int64_null/serial_kurtosis_int64_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.3.ast
deleted file mode 100644
index 77b4c9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8/serial_kurtosis_int8.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.3.ast
deleted file mode 100644
index 367ea53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_int8_null/serial_kurtosis_int8_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.3.ast
deleted file mode 100644
index c388d44..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_kurtosis_mixed/serial_kurtosis_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double/serial_skewness_double.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.3.ast
deleted file mode 100644
index 126091f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_double_null/serial_skewness_double_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_empty/serial_skewness_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_empty/serial_skewness_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_empty/serial_skewness_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_empty/serial_skewness_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_empty/serial_skewness_empty.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_empty/serial_skewness_empty.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float/serial_skewness_float.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.3.ast
deleted file mode 100644
index 126091f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_float_null/serial_skewness_float_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16/serial_skewness_int16.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.3.ast
deleted file mode 100644
index 126091f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int16_null/serial_skewness_int16_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32/serial_skewness_int32.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.3.ast
deleted file mode 100644
index 126091f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int32_null/serial_skewness_int32_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64/serial_skewness_int64.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.3.ast
deleted file mode 100644
index 126091f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int64_null/serial_skewness_int64_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.3.ast
deleted file mode 100644
index d77c450..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8/serial_skewness_int8.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.3.ast
deleted file mode 100644
index 126091f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_int8_null/serial_skewness_int8_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.3.ast
deleted file mode 100644
index 93911c5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_skewness_mixed/serial_skewness_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double/serial_stddev_double.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.3.ast
deleted file mode 100644
index 5fffca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_double_null/serial_stddev_double_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_empty/serial_stddev_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_empty/serial_stddev_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_empty/serial_stddev_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_empty/serial_stddev_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_empty/serial_stddev_empty.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_empty/serial_stddev_empty.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float/serial_stddev_float.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.3.ast
deleted file mode 100644
index 5fffca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_float_null/serial_stddev_float_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16/serial_stddev_int16.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.3.ast
deleted file mode 100644
index 5fffca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int16_null/serial_stddev_int16_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32/serial_stddev_int32.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.3.ast
deleted file mode 100644
index 5fffca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int32_null/serial_stddev_int32_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64/serial_stddev_int64.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.3.ast
deleted file mode 100644
index 5fffca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int64_null/serial_stddev_int64_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.3.ast
deleted file mode 100644
index f584460..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8/serial_stddev_int8.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.3.ast
deleted file mode 100644
index 5fffca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_int8_null/serial_stddev_int8_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.3.ast
deleted file mode 100644
index 60cfe76..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_mixed/serial_stddev_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.3.ast
deleted file mode 100644
index 2e6d6ae..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_stddev_pop_mixed/serial_stddev_pop_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double/serial_var_double.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.3.ast
deleted file mode 100644
index a5e419b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_double_null/serial_var_double_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_empty/serial_var_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_empty/serial_var_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_empty/serial_var_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_empty/serial_var_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_empty/serial_var_empty.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_empty/serial_var_empty.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float/serial_var_float.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.3.ast
deleted file mode 100644
index a5e419b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_float_null/serial_var_float_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16/serial_var_int16.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.3.ast
deleted file mode 100644
index a5e419b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int16_null/serial_var_int16_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32/serial_var_int32.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.3.ast
deleted file mode 100644
index a5e419b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int32_null/serial_var_int32_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64/serial_var_int64.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.3.ast
deleted file mode 100644
index a5e419b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int64_null/serial_var_int64_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.3.ast
deleted file mode 100644
index 91b3b2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8/serial_var_int8.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.3.ast
deleted file mode 100644
index a5e419b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_int8_null/serial_var_int8_null.3.ast
+++ /dev/null

@@ -1,57 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-var
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=t
-      ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    t:=Variable [ Name=$t ]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.3.ast
deleted file mode 100644
index 1087b9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_mixed/serial_var_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.3.ast
deleted file mode 100644
index fff6e1a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/serial_var_pop_mixed/serial_var_pop_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double/skewness_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double/skewness_double.1.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double/skewness_double.1.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double/skewness_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double/skewness_double.3.ast
deleted file mode 100644
index 257e9b4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double/skewness_double.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [DOUBLE] [1.0]
-        LiteralExpr [DOUBLE] [2.0]
-        FunctionCall null.double@1[
-          LiteralExpr [STRING] [3.0]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double_null/skewness_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double_null/skewness_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double_null/skewness_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double_null/skewness_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double_null/skewness_double_null.3.ast
deleted file mode 100644
index efd55a6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_double_null/skewness_double_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.sql-skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_01/skewness_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_01/skewness_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_01/skewness_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_01/skewness_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_01/skewness_empty_01.3.ast
deleted file mode 100644
index 5419977..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_01/skewness_empty_01.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [LONG] [1]
-        LiteralExpr [LONG] [2]
-        LiteralExpr [LONG] [3]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-    Where
-      OperatorExpr [
-        Variable [ Name=$x ]
-        >
-        LiteralExpr [LONG] [10]
-      ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_02/skewness_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_02/skewness_empty_02.1.ast
deleted file mode 100644
index baf977e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_02/skewness_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_02/skewness_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_02/skewness_empty_02.3.ast
deleted file mode 100644
index 3ddfd4d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_empty_02/skewness_empty_02.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=val
-    ]
-    ]
-    FROM [      FunctionCall asterix.dataset@1[
-        LiteralExpr [STRING] [test.Test]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float/skewness_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float/skewness_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float/skewness_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float/skewness_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float/skewness_float.3.ast
deleted file mode 100644
index 2eed91d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float/skewness_float.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float_null/skewness_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float_null/skewness_float_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float_null/skewness_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float_null/skewness_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float_null/skewness_float_null.3.ast
deleted file mode 100644
index 75251b9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_float_null/skewness_float_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.sql-skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16/skewness_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16/skewness_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16/skewness_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16/skewness_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16/skewness_int16.3.ast
deleted file mode 100644
index 46e1594..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16/skewness_int16.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16_null/skewness_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16_null/skewness_int16_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16_null/skewness_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16_null/skewness_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16_null/skewness_int16_null.3.ast
deleted file mode 100644
index a454859..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int16_null/skewness_int16_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.sql-skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32/skewness_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32/skewness_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32/skewness_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32/skewness_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32/skewness_int32.3.ast
deleted file mode 100644
index d9c0023..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32/skewness_int32.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int32@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int32@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int32@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32_null/skewness_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32_null/skewness_int32_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32_null/skewness_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32_null/skewness_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32_null/skewness_int32_null.3.ast
deleted file mode 100644
index d551bed..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int32_null/skewness_int32_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.sql-skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64/skewness_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64/skewness_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64/skewness_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64/skewness_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64/skewness_int64.3.ast
deleted file mode 100644
index 5bcb272..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64/skewness_int64.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64_null/skewness_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64_null/skewness_int64_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64_null/skewness_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64_null/skewness_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64_null/skewness_int64_null.3.ast
deleted file mode 100644
index 7f53f71..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int64_null/skewness_int64_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.sql-skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8/skewness_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8/skewness_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8/skewness_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8/skewness_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8/skewness_int8.3.ast
deleted file mode 100644
index 0dde87f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8/skewness_int8.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8_null/skewness_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8_null/skewness_int8_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8_null/skewness_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8_null/skewness_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8_null/skewness_int8_null.3.ast
deleted file mode 100644
index fb9e831..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_int8_null/skewness_int8_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.sql-skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_mixed/skewness_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_mixed/skewness_mixed.3.ast
deleted file mode 100644
index d45db6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/skewness_mixed/skewness_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double/stddev_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double/stddev_double.1.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double/stddev_double.1.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double/stddev_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double/stddev_double.3.ast
deleted file mode 100644
index ab8468e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double/stddev_double.3.ast
+++ /dev/null

@@ -1,51 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double_null/stddev_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double_null/stddev_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double_null/stddev_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double_null/stddev_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double_null/stddev_double_null.3.ast
deleted file mode 100644
index 15687f0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_double_null/stddev_double_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.sql-stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.sql-stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_01/stddev_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_01/stddev_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_01/stddev_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_01/stddev_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_01/stddev_empty_01.3.ast
deleted file mode 100644
index 1878d8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_01/stddev_empty_01.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_02/stddev_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_02/stddev_empty_02.1.ast
deleted file mode 100644
index baf977e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_02/stddev_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_02/stddev_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_02/stddev_empty_02.3.ast
deleted file mode 100644
index d560c87..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_empty_02/stddev_empty_02.3.ast
+++ /dev/null

@@ -1,50 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float/stddev_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float/stddev_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float/stddev_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float/stddev_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float/stddev_float.3.ast
deleted file mode 100644
index 761af43..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float/stddev_float.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float_null/stddev_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float_null/stddev_float_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float_null/stddev_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float_null/stddev_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float_null/stddev_float_null.3.ast
deleted file mode 100644
index 4e5380c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_float_null/stddev_float_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.sql-stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.sql-stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16/stddev_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16/stddev_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16/stddev_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16/stddev_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16/stddev_int16.3.ast
deleted file mode 100644
index 6a49179..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16/stddev_int16.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16_null/stddev_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16_null/stddev_int16_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16_null/stddev_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16_null/stddev_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16_null/stddev_int16_null.3.ast
deleted file mode 100644
index 5490833..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int16_null/stddev_int16_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.sql-stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.sql-stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32/stddev_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32/stddev_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32/stddev_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32/stddev_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32/stddev_int32.3.ast
deleted file mode 100644
index 6059d33..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32/stddev_int32.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32_null/stddev_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32_null/stddev_int32_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32_null/stddev_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32_null/stddev_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32_null/stddev_int32_null.3.ast
deleted file mode 100644
index 89e7c18..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int32_null/stddev_int32_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.sql-stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.sql-stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64/stddev_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64/stddev_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64/stddev_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64/stddev_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64/stddev_int64.3.ast
deleted file mode 100644
index 1bf3e70..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64/stddev_int64.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64_null/stddev_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64_null/stddev_int64_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64_null/stddev_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64_null/stddev_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64_null/stddev_int64_null.3.ast
deleted file mode 100644
index 4568ffe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int64_null/stddev_int64_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.sql-stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.sql-stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8/stddev_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8/stddev_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8/stddev_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8/stddev_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8/stddev_int8.3.ast
deleted file mode 100644
index e1bd8a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8/stddev_int8.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8_null/stddev_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8_null/stddev_int8_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8_null/stddev_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8_null/stddev_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8_null/stddev_int8_null.3.ast
deleted file mode 100644
index d794390..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_int8_null/stddev_int8_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.sql-stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.sql-stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_mixed/stddev_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_mixed/stddev_mixed.3.ast
deleted file mode 100644
index e9f65c8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_mixed/stddev_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_pop_mixed/stddev_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_pop_mixed/stddev_pop_mixed.3.ast
deleted file mode 100644
index 7c39453..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/stddev_pop_mixed/stddev_pop_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double/var_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double/var_double.1.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double/var_double.1.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double/var_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double/var_double.3.ast
deleted file mode 100644
index 656ce03..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double/var_double.3.ast
+++ /dev/null

@@ -1,51 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double_null/var_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double_null/var_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double_null/var_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double_null/var_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double_null/var_double_null.3.ast
deleted file mode 100644
index a7c3964..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_double_null/var_double_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.sql-var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.sql-var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_01/var_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_01/var_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_01/var_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_01/var_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_01/var_empty_01.3.ast
deleted file mode 100644
index 7882880..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_01/var_empty_01.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_02/var_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_02/var_empty_02.1.ast
deleted file mode 100644
index baf977e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_02/var_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_02/var_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_02/var_empty_02.3.ast
deleted file mode 100644
index 0029156..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_empty_02/var_empty_02.3.ast
+++ /dev/null

@@ -1,50 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float/var_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float/var_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float/var_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float/var_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float/var_float.3.ast
deleted file mode 100644
index a534e0c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float/var_float.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float_null/var_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float_null/var_float_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float_null/var_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float_null/var_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float_null/var_float_null.3.ast
deleted file mode 100644
index 698bace..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_float_null/var_float_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.sql-var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.sql-var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16/var_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16/var_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16/var_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16/var_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16/var_int16.3.ast
deleted file mode 100644
index cecf5cc..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16/var_int16.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16_null/var_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16_null/var_int16_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16_null/var_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16_null/var_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16_null/var_int16_null.3.ast
deleted file mode 100644
index 633309f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int16_null/var_int16_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.sql-var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.sql-var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32/var_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32/var_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32/var_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32/var_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32/var_int32.3.ast
deleted file mode 100644
index c38a181..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32/var_int32.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int32@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32_null/var_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32_null/var_int32_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32_null/var_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32_null/var_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32_null/var_int32_null.3.ast
deleted file mode 100644
index 470f53f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int32_null/var_int32_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.sql-var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.sql-var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64/var_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64/var_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64/var_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64/var_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64/var_int64.3.ast
deleted file mode 100644
index 858716d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64/var_int64.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64_null/var_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64_null/var_int64_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64_null/var_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64_null/var_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64_null/var_int64_null.3.ast
deleted file mode 100644
index 3c2b5e6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int64_null/var_int64_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.sql-var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.sql-var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8/var_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8/var_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8/var_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8/var_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8/var_int8.3.ast
deleted file mode 100644
index 9d9db88..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8/var_int8.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.sql-var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8_null/var_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8_null/var_int8_null.1.ast
deleted file mode 100644
index b01283e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8_null/var_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : bigint,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8_null/var_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8_null/var_int8_null.3.ast
deleted file mode 100644
index 4ee2da4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_int8_null/var_int8_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.sql-var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.sql-var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_mixed/var_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_mixed/var_mixed.3.ast
deleted file mode 100644
index 4ce8e68..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_mixed/var_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-var_samp@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_pop_mixed/var_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_pop_mixed/var_pop_mixed.3.ast
deleted file mode 100644
index 0727aad..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/var_pop_mixed/var_pop_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.sql-var_pop@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double/kurtosis_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double/kurtosis_double.1.ast
deleted file mode 100644
index 086bc5f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double/kurtosis_double.1.ast
+++ /dev/null

@@ -1,2 +0,0 @@
-DataverseUse test
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double/kurtosis_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double/kurtosis_double.3.ast
deleted file mode 100644
index 417a2c2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double/kurtosis_double.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [DOUBLE] [1.0]
-        LiteralExpr [DOUBLE] [2.0]
-        FunctionCall null.double@1[
-          LiteralExpr [STRING] [3.0]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double_null/kurtosis_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double_null/kurtosis_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double_null/kurtosis_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double_null/kurtosis_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double_null/kurtosis_double_null.3.ast
deleted file mode 100644
index 5d7e04c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_double_null/kurtosis_double_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_01/kurtosis_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_01/kurtosis_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_01/kurtosis_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_01/kurtosis_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_01/kurtosis_empty_01.3.ast
deleted file mode 100644
index 98602ed..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_01/kurtosis_empty_01.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [LONG] [1]
-        LiteralExpr [LONG] [2]
-        LiteralExpr [LONG] [3]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-    Where
-      OperatorExpr [
-        Variable [ Name=$x ]
-        >
-        LiteralExpr [LONG] [10]
-      ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_02/kurtosis_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_02/kurtosis_empty_02.1.ast
deleted file mode 100644
index babcce4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_02/kurtosis_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : integer,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_02/kurtosis_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_02/kurtosis_empty_02.3.ast
deleted file mode 100644
index 2447f01..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_empty_02/kurtosis_empty_02.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=val
-    ]
-    ]
-    FROM [      FunctionCall asterix.dataset@1[
-        LiteralExpr [STRING] [test.Test]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float/kurtosis_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float/kurtosis_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float/kurtosis_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float/kurtosis_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float/kurtosis_float.3.ast
deleted file mode 100644
index 163c050..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float/kurtosis_float.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float_null/kurtosis_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float_null/kurtosis_float_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float_null/kurtosis_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float_null/kurtosis_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float_null/kurtosis_float_null.3.ast
deleted file mode 100644
index 982ae95..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_float_null/kurtosis_float_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16/kurtosis_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16/kurtosis_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16/kurtosis_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16/kurtosis_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16/kurtosis_int16.3.ast
deleted file mode 100644
index 878c950..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16/kurtosis_int16.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16_null/kurtosis_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16_null/kurtosis_int16_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16_null/kurtosis_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16_null/kurtosis_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16_null/kurtosis_int16_null.3.ast
deleted file mode 100644
index c472279..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int16_null/kurtosis_int16_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32/kurtosis_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32/kurtosis_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32/kurtosis_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32/kurtosis_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32/kurtosis_int32.3.ast
deleted file mode 100644
index 6c8b3fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32/kurtosis_int32.3.ast
+++ /dev/null

@@ -1,18 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [LONG] [1]
-        LiteralExpr [LONG] [2]
-        LiteralExpr [LONG] [3]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32_null/kurtosis_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32_null/kurtosis_int32_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32_null/kurtosis_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32_null/kurtosis_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32_null/kurtosis_int32_null.3.ast
deleted file mode 100644
index b4b84dd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int32_null/kurtosis_int32_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64/kurtosis_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64/kurtosis_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64/kurtosis_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64/kurtosis_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64/kurtosis_int64.3.ast
deleted file mode 100644
index cf519fc..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64/kurtosis_int64.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64_null/kurtosis_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64_null/kurtosis_int64_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64_null/kurtosis_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64_null/kurtosis_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64_null/kurtosis_int64_null.3.ast
deleted file mode 100644
index fad8053..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int64_null/kurtosis_int64_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8/kurtosis_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8/kurtosis_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8/kurtosis_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8/kurtosis_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8/kurtosis_int8.3.ast
deleted file mode 100644
index 1d36b03..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8/kurtosis_int8.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8_null/kurtosis_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8_null/kurtosis_int8_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8_null/kurtosis_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8_null/kurtosis_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8_null/kurtosis_int8_null.3.ast
deleted file mode 100644
index ad20582..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_int8_null/kurtosis_int8_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [kurtosis]
-    :
-    FunctionCall asterix.kurtosis@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_mixed/kurtosis_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_mixed/kurtosis_mixed.3.ast
deleted file mode 100644
index 4048b74..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/kurtosis_mixed/kurtosis_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis/scalar_kurtosis.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis/scalar_kurtosis.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis/scalar_kurtosis.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis/scalar_kurtosis.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis/scalar_kurtosis.3.ast
deleted file mode 100644
index 8d26180..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis/scalar_kurtosis.3.ast
+++ /dev/null

@@ -1,105 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_empty/scalar_kurtosis_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_empty/scalar_kurtosis_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_empty/scalar_kurtosis_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_empty/scalar_kurtosis_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_empty/scalar_kurtosis_empty.3.ast
deleted file mode 100644
index 163f286..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_empty/scalar_kurtosis_empty.3.ast
+++ /dev/null

@@ -1,7 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.kurtosis@1[
-  OrderedListConstructor [
-  ]
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_null/scalar_kurtosis_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_null/scalar_kurtosis_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_null/scalar_kurtosis_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_null/scalar_kurtosis_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_null/scalar_kurtosis_null.3.ast
deleted file mode 100644
index bbb93cc..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_kurtosis_null/scalar_kurtosis_null.3.ast
+++ /dev/null

@@ -1,111 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.kurtosis@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness/scalar_skewness.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness/scalar_skewness.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness/scalar_skewness.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness/scalar_skewness.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness/scalar_skewness.3.ast
deleted file mode 100644
index dc5525d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness/scalar_skewness.3.ast
+++ /dev/null

@@ -1,105 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_empty/scalar_skewness_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_empty/scalar_skewness_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_empty/scalar_skewness_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_empty/scalar_skewness_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_empty/scalar_skewness_empty.3.ast
deleted file mode 100644
index 45f7041..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_empty/scalar_skewness_empty.3.ast
+++ /dev/null

@@ -1,7 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  OrderedListConstructor [
-  ]
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_null/scalar_skewness_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_null/scalar_skewness_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_null/scalar_skewness_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_null/scalar_skewness_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_null/scalar_skewness_null.3.ast
deleted file mode 100644
index 685fc80..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_skewness_null/scalar_skewness_null.3.ast
+++ /dev/null

@@ -1,111 +0,0 @@
-DataverseUse test
-Query:
-Let Variable [ Name=$i8 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int8@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i16 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int16@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i32 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int32@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$i64 ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.int64@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$f ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.float@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-Let Variable [ Name=$d ]
-  :=
-  FunctionCall asterix.skewness@1[
-    OrderedListConstructor [
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [1]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [2]
-      ]
-      FunctionCall test.double@1[
-        LiteralExpr [STRING] [3]
-      ]
-      LiteralExpr [NULL]
-    ]
-  ]
-SELECT ELEMENT [
-Variable [ Name=$i ]
-]
-FROM [  OrderedListConstructor [
-    Variable [ Name=$i8 ]
-    Variable [ Name=$i16 ]
-    Variable [ Name=$i32 ]
-    Variable [ Name=$i64 ]
-    Variable [ Name=$f ]
-    Variable [ Name=$d ]
-  ]
-  AS Variable [ Name=$i ]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev/scalar_stddev.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev/scalar_stddev.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev/scalar_stddev.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev/scalar_stddev.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev/scalar_stddev.3.ast
deleted file mode 100644
index f80e1f9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev/scalar_stddev.3.ast
+++ /dev/null

@@ -1,222 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_empty/scalar_stddev_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_empty/scalar_stddev_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_empty/scalar_stddev_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_empty/scalar_stddev_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_empty/scalar_stddev_empty.3.ast
deleted file mode 100644
index 158863d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_empty/scalar_stddev_empty.3.ast
+++ /dev/null

@@ -1,27 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_null/scalar_stddev_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_null/scalar_stddev_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_null/scalar_stddev_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_null/scalar_stddev_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_null/scalar_stddev_null.3.ast
deleted file mode 100644
index a3e4c95..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_stddev_null/scalar_stddev_null.3.ast
+++ /dev/null

@@ -1,234 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.stddev_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.stddev_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var/scalar_var.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var/scalar_var.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var/scalar_var.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var/scalar_var.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var/scalar_var.3.ast
deleted file mode 100644
index 8d75e8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var/scalar_var.3.ast
+++ /dev/null

@@ -1,222 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_empty/scalar_var_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_empty/scalar_var_empty.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_empty/scalar_var_empty.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_empty/scalar_var_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_empty/scalar_var_empty.3.ast
deleted file mode 100644
index 2df85ec..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_empty/scalar_var_empty.3.ast
+++ /dev/null

@@ -1,27 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        OrderedListConstructor [
-        ]
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_null/scalar_var_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_null/scalar_var_null.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_null/scalar_var_null.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_null/scalar_var_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_null/scalar_var_null.3.ast
deleted file mode 100644
index feeae0a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_var_null/scalar_var_null.3.ast
+++ /dev/null

@@ -1,234 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.var_samp@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      Let Variable [ Name=$i8 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int8@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i16 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int16@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i32 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int32@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$i64 ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.int64@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$f ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.float@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      Let Variable [ Name=$d ]
-        :=
-        FunctionCall asterix.var_pop@1[
-          OrderedListConstructor [
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [1]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [2]
-            ]
-            FunctionCall test.double@1[
-              LiteralExpr [STRING] [3]
-            ]
-            LiteralExpr [NULL]
-          ]
-        ]
-      SELECT ELEMENT [
-      Variable [ Name=$i ]
-      ]
-      FROM [        OrderedListConstructor [
-          Variable [ Name=$i8 ]
-          Variable [ Name=$i16 ]
-          Variable [ Name=$i32 ]
-          Variable [ Name=$i64 ]
-          Variable [ Name=$f ]
-          Variable [ Name=$d ]
-        ]
-        AS Variable [ Name=$i ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double/serial_kurtosis_double.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_double_null/serial_kurtosis_double_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_empty/serial_kurtosis_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_empty/serial_kurtosis_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_empty/serial_kurtosis_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_empty/serial_kurtosis_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_empty/serial_kurtosis_empty.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_empty/serial_kurtosis_empty.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float/serial_kurtosis_float.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_float_null/serial_kurtosis_float_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16/serial_kurtosis_int16.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int16_null/serial_kurtosis_int16_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32/serial_kurtosis_int32.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int32_null/serial_kurtosis_int32_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64/serial_kurtosis_int64.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int64_null/serial_kurtosis_int64_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.3.ast
deleted file mode 100644
index ea239a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8/serial_kurtosis_int8.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_int8_null/serial_kurtosis_int8_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.3.ast
deleted file mode 100644
index 20551a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_kurtosis_mixed/serial_kurtosis_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.kurtosis@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-kurtosis
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double/serial_skewness_double.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_double_null/serial_skewness_double_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_empty/serial_skewness_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_empty/serial_skewness_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_empty/serial_skewness_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_empty/serial_skewness_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_empty/serial_skewness_empty.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_empty/serial_skewness_empty.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float/serial_skewness_float.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_float_null/serial_skewness_float_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16/serial_skewness_int16.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int16_null/serial_skewness_int16_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32/serial_skewness_int32.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int32_null/serial_skewness_int32_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64/serial_skewness_int64.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int64_null/serial_skewness_int64_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.3.ast
deleted file mode 100644
index 04c73ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8/serial_skewness_int8.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_int8_null/serial_skewness_int8_null.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.3.ast
deleted file mode 100644
index 925de9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_skewness_mixed/serial_skewness_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-skewness
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double/serial_stddev_double.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.3.ast
deleted file mode 100644
index 98e072d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_double_null/serial_stddev_double_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_empty/serial_stddev_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_empty/serial_stddev_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_empty/serial_stddev_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_empty/serial_stddev_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_empty/serial_stddev_empty.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_empty/serial_stddev_empty.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float/serial_stddev_float.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.3.ast
deleted file mode 100644
index 98e072d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_float_null/serial_stddev_float_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16/serial_stddev_int16.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.3.ast
deleted file mode 100644
index 98e072d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int16_null/serial_stddev_int16_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32/serial_stddev_int32.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.3.ast
deleted file mode 100644
index 98e072d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int32_null/serial_stddev_int32_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64/serial_stddev_int64.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.3.ast
deleted file mode 100644
index 98e072d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int64_null/serial_stddev_int64_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.3.ast
deleted file mode 100644
index a246849..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8/serial_stddev_int8.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.3.ast
deleted file mode 100644
index 98e072d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_int8_null/serial_stddev_int8_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.3.ast
deleted file mode 100644
index d8cdbde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_mixed/serial_stddev_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_samp
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.3.ast
deleted file mode 100644
index 5edf9bd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_stddev_pop_mixed/serial_stddev_pop_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-stddev_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double/serial_var_double.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.3.ast
deleted file mode 100644
index 98690d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_double_null/serial_var_double_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_empty/serial_var_empty.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_empty/serial_var_empty.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_empty/serial_var_empty.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_empty/serial_var_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_empty/serial_var_empty.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_empty/serial_var_empty.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float/serial_var_float.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.1.ast
deleted file mode 100644
index 9af248f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : float
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.3.ast
deleted file mode 100644
index 98690d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_float_null/serial_var_float_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16/serial_var_int16.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.1.ast
deleted file mode 100644
index 16d25a8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : smallint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.3.ast
deleted file mode 100644
index 98690d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int16_null/serial_var_int16_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32/serial_var_int32.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.1.ast
deleted file mode 100644
index 6eaf31a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : integer
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.3.ast
deleted file mode 100644
index 98690d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int32_null/serial_var_int32_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64/serial_var_int64.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.1.ast
deleted file mode 100644
index 7911712..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : bigint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.3.ast
deleted file mode 100644
index 98690d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int64_null/serial_var_int64_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.3.ast
deleted file mode 100644
index 7cebf6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8/serial_var_int8.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=val
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    val:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [val]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.1.ast
deleted file mode 100644
index 44c9cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : tinyint
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.3.ast
deleted file mode 100644
index 98690d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_int8_null/serial_var_int8_null.3.ast
+++ /dev/null

@@ -1,54 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.3.ast
deleted file mode 100644
index 32e4fea..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_mixed/serial_var_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_samp
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.1.ast
deleted file mode 100644
index a61c9df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.1.ast
+++ /dev/null

@@ -1,9 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  open RecordType {
-    id : bigint,
-    gid : bigint,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.2.ast
+++ /dev/null

@@ -1 +0,0 @@
-DataverseUse test

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.3.ast
deleted file mode 100644
index 8c99192..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/serial_var_pop_mixed/serial_var_pop_mixed.3.ast
+++ /dev/null

@@ -1,40 +0,0 @@
-DataverseUse test
-Query:
-SELECT [
-Variable [ Name=$gid ]
-gid
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$g ]
-      Field=valplus
-    ]
-    ]
-    FROM [      Variable [ Name=$g ]
-      AS Variable [ Name=$g ]
-    ]
-  )
-]
-var_pop
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.Test]
-  ]
-  AS Variable [ Name=$t ]
-]
-Groupby
-  Variable [ Name=$gid ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$t ]
-    Field=gid
-  ]
-  GROUP AS Variable [ Name=$g ]
-  (
-    valplus:=FunctionCall asterix.field-access-by-name@2[
-  Variable [ Name=$t ]
-  LiteralExpr [STRING] [valplus]
-]
-  )
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double/skewness_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double/skewness_double.1.ast
deleted file mode 100644
index 086bc5f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double/skewness_double.1.ast
+++ /dev/null

@@ -1,2 +0,0 @@
-DataverseUse test
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double/skewness_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double/skewness_double.3.ast
deleted file mode 100644
index f494ef4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double/skewness_double.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [DOUBLE] [1.0]
-        LiteralExpr [DOUBLE] [2.0]
-        FunctionCall null.double@1[
-          LiteralExpr [STRING] [3.0]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double_null/skewness_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double_null/skewness_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double_null/skewness_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double_null/skewness_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double_null/skewness_double_null.3.ast
deleted file mode 100644
index 37aee67..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_double_null/skewness_double_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_01/skewness_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_01/skewness_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_01/skewness_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_01/skewness_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_01/skewness_empty_01.3.ast
deleted file mode 100644
index b22541d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_01/skewness_empty_01.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [LONG] [1]
-        LiteralExpr [LONG] [2]
-        LiteralExpr [LONG] [3]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-    Where
-      OperatorExpr [
-        Variable [ Name=$x ]
-        >
-        LiteralExpr [LONG] [10]
-      ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_02/skewness_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_02/skewness_empty_02.1.ast
deleted file mode 100644
index babcce4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_02/skewness_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : integer,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_02/skewness_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_02/skewness_empty_02.3.ast
deleted file mode 100644
index 893d26e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_empty_02/skewness_empty_02.3.ast
+++ /dev/null

@@ -1,19 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=val
-    ]
-    ]
-    FROM [      FunctionCall asterix.dataset@1[
-        LiteralExpr [STRING] [test.Test]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float/skewness_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float/skewness_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float/skewness_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float/skewness_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float/skewness_float.3.ast
deleted file mode 100644
index 8db90d3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float/skewness_float.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.float@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float_null/skewness_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float_null/skewness_float_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float_null/skewness_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float_null/skewness_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float_null/skewness_float_null.3.ast
deleted file mode 100644
index c198b59..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_float_null/skewness_float_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16/skewness_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16/skewness_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16/skewness_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16/skewness_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16/skewness_int16.3.ast
deleted file mode 100644
index 4239198..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16/skewness_int16.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int16@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16_null/skewness_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16_null/skewness_int16_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16_null/skewness_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16_null/skewness_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16_null/skewness_int16_null.3.ast
deleted file mode 100644
index 9870c60..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int16_null/skewness_int16_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32/skewness_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32/skewness_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32/skewness_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32/skewness_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32/skewness_int32.3.ast
deleted file mode 100644
index 16414e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32/skewness_int32.3.ast
+++ /dev/null

@@ -1,18 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        LiteralExpr [LONG] [1]
-        LiteralExpr [LONG] [2]
-        LiteralExpr [LONG] [3]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32_null/skewness_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32_null/skewness_int32_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32_null/skewness_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32_null/skewness_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32_null/skewness_int32_null.3.ast
deleted file mode 100644
index 9d49b65..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int32_null/skewness_int32_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64/skewness_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64/skewness_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64/skewness_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64/skewness_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64/skewness_int64.3.ast
deleted file mode 100644
index f9ec6d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64/skewness_int64.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int64@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64_null/skewness_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64_null/skewness_int64_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64_null/skewness_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64_null/skewness_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64_null/skewness_int64_null.3.ast
deleted file mode 100644
index 7b2555f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int64_null/skewness_int64_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8/skewness_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8/skewness_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8/skewness_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8/skewness_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8/skewness_int8.3.ast
deleted file mode 100644
index 28f63a3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8/skewness_int8.3.ast
+++ /dev/null

@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [1]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [2]
-        ]
-        FunctionCall test.int8@1[
-          LiteralExpr [STRING] [3]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8_null/skewness_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8_null/skewness_int8_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8_null/skewness_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8_null/skewness_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8_null/skewness_int8_null.3.ast
deleted file mode 100644
index 1b49e43..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_int8_null/skewness_int8_null.3.ast
+++ /dev/null

@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [skewness]
-    :
-    FunctionCall asterix.skewness@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_mixed/skewness_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_mixed/skewness_mixed.3.ast
deleted file mode 100644
index 0e9858f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/skewness_mixed/skewness_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.skewness@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double/stddev_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double/stddev_double.1.ast
deleted file mode 100644
index 086bc5f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double/stddev_double.1.ast
+++ /dev/null

@@ -1,2 +0,0 @@
-DataverseUse test
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double/stddev_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double/stddev_double.3.ast
deleted file mode 100644
index 21402a9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double/stddev_double.3.ast
+++ /dev/null

@@ -1,51 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double_null/stddev_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double_null/stddev_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double_null/stddev_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double_null/stddev_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double_null/stddev_double_null.3.ast
deleted file mode 100644
index 03c867b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_double_null/stddev_double_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_01/stddev_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_01/stddev_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_01/stddev_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_01/stddev_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_01/stddev_empty_01.3.ast
deleted file mode 100644
index 8937f5d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_01/stddev_empty_01.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_02/stddev_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_02/stddev_empty_02.1.ast
deleted file mode 100644
index babcce4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_02/stddev_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : integer,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_02/stddev_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_02/stddev_empty_02.3.ast
deleted file mode 100644
index a5dcac9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_empty_02/stddev_empty_02.3.ast
+++ /dev/null

@@ -1,50 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float/stddev_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float/stddev_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float/stddev_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float/stddev_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float/stddev_float.3.ast
deleted file mode 100644
index 89fca0b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float/stddev_float.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float_null/stddev_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float_null/stddev_float_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float_null/stddev_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float_null/stddev_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float_null/stddev_float_null.3.ast
deleted file mode 100644
index 95ebace..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_float_null/stddev_float_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16/stddev_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16/stddev_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16/stddev_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16/stddev_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16/stddev_int16.3.ast
deleted file mode 100644
index 0bb10a7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16/stddev_int16.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16_null/stddev_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16_null/stddev_int16_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16_null/stddev_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16_null/stddev_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16_null/stddev_int16_null.3.ast
deleted file mode 100644
index 1a59b30..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int16_null/stddev_int16_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32/stddev_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32/stddev_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32/stddev_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32/stddev_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32/stddev_int32.3.ast
deleted file mode 100644
index 906ee9b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32/stddev_int32.3.ast
+++ /dev/null

@@ -1,48 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32_null/stddev_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32_null/stddev_int32_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32_null/stddev_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32_null/stddev_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32_null/stddev_int32_null.3.ast
deleted file mode 100644
index b60a68b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int32_null/stddev_int32_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64/stddev_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64/stddev_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64/stddev_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64/stddev_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64/stddev_int64.3.ast
deleted file mode 100644
index 0d50d68..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64/stddev_int64.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64_null/stddev_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64_null/stddev_int64_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64_null/stddev_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64_null/stddev_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64_null/stddev_int64_null.3.ast
deleted file mode 100644
index 3523989..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int64_null/stddev_int64_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8/stddev_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8/stddev_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8/stddev_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8/stddev_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8/stddev_int8.3.ast
deleted file mode 100644
index f907f85..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8/stddev_int8.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.stddev_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8_null/stddev_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8_null/stddev_int8_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8_null/stddev_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8_null/stddev_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8_null/stddev_int8_null.3.ast
deleted file mode 100644
index 1a4af34..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_int8_null/stddev_int8_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [stddev_samp]
-    :
-    FunctionCall asterix.stddev_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [stddev_pop]
-    :
-    FunctionCall asterix.stddev_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_mixed/stddev_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_mixed/stddev_mixed.3.ast
deleted file mode 100644
index 1013db0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_mixed/stddev_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.stddev_samp@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_pop_mixed/stddev_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_pop_mixed/stddev_pop_mixed.3.ast
deleted file mode 100644
index cc3e8fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/stddev_pop_mixed/stddev_pop_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.stddev_pop@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double/var_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double/var_double.1.ast
deleted file mode 100644
index 086bc5f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double/var_double.1.ast
+++ /dev/null

@@ -1,2 +0,0 @@
-DataverseUse test
-

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double/var_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double/var_double.3.ast
deleted file mode 100644
index b561ed9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double/var_double.3.ast
+++ /dev/null

@@ -1,51 +0,0 @@
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [DOUBLE] [1.0]
-              LiteralExpr [DOUBLE] [2.0]
-              FunctionCall null.double@1[
-                LiteralExpr [STRING] [3.0]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double_null/var_double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double_null/var_double_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double_null/var_double_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double_null/var_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double_null/var_double_null.3.ast
deleted file mode 100644
index 562c731..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_double_null/var_double_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=doubleField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_01/var_empty_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_01/var_empty_01.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_01/var_empty_01.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_01/var_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_01/var_empty_01.3.ast
deleted file mode 100644
index 985f46a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_01/var_empty_01.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-          Where
-            OperatorExpr [
-              Variable [ Name=$x ]
-              >
-              LiteralExpr [LONG] [10]
-            ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_02/var_empty_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_02/var_empty_02.1.ast
deleted file mode 100644
index babcce4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_02/var_empty_02.1.ast
+++ /dev/null

@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl TestType [
-  closed RecordType {
-    id : integer,
-    val : double
-  }
-]
-DatasetDecl Test(TestType) partitioned by [[id]]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_02/var_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_02/var_empty_02.3.ast
deleted file mode 100644
index 9428d0c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_empty_02/var_empty_02.3.ast
+++ /dev/null

@@ -1,50 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            Variable [ Name=$x ]
-            Field=val
-          ]
-          ]
-          FROM [            FunctionCall asterix.dataset@1[
-              LiteralExpr [STRING] [test.Test]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float/var_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float/var_float.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float/var_float.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float/var_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float/var_float.3.ast
deleted file mode 100644
index 415e866..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float/var_float.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.float@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float_null/var_float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float_null/var_float_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float_null/var_float_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float_null/var_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float_null/var_float_null.3.ast
deleted file mode 100644
index cec50b7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_float_null/var_float_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=floatField
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16/var_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16/var_int16.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16/var_int16.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16/var_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16/var_int16.3.ast
deleted file mode 100644
index f4919e7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16/var_int16.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int16@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16_null/var_int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16_null/var_int16_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16_null/var_int16_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16_null/var_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16_null/var_int16_null.3.ast
deleted file mode 100644
index f8ebbeb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int16_null/var_int16_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int16Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32/var_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32/var_int32.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32/var_int32.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32/var_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32/var_int32.3.ast
deleted file mode 100644
index 0b529b5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32/var_int32.3.ast
+++ /dev/null

@@ -1,48 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              LiteralExpr [LONG] [1]
-              LiteralExpr [LONG] [2]
-              LiteralExpr [LONG] [3]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32_null/var_int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32_null/var_int32_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32_null/var_int32_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32_null/var_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32_null/var_int32_null.3.ast
deleted file mode 100644
index b50dcbb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int32_null/var_int32_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int32Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64/var_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64/var_int64.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64/var_int64.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64/var_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64/var_int64.3.ast
deleted file mode 100644
index 2dc97d3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64/var_int64.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int64@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64_null/var_int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64_null/var_int64_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64_null/var_int64_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64_null/var_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64_null/var_int64_null.3.ast
deleted file mode 100644
index 7d08453..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int64_null/var_int64_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int64Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8/var_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8/var_int8.1.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8/var_int8.1.ast
+++ /dev/null


diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8/var_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8/var_int8.3.ast
deleted file mode 100644
index 21311bb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8/var_int8.3.ast
+++ /dev/null

@@ -1,60 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_samp@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    (
-      SELECT ELEMENT [
-      FunctionCall asterix.var_pop@1[
-        (
-          SELECT ELEMENT [
-          Variable [ Name=$x ]
-          ]
-          FROM [            OrderedListConstructor [
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [1]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [2]
-              ]
-              FunctionCall test.int8@1[
-                LiteralExpr [STRING] [3]
-              ]
-            ]
-            AS Variable [ Name=$x ]
-          ]
-        )
-      ]
-      ]
-    )
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8_null/var_int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8_null/var_int8_null.1.ast
deleted file mode 100644
index 2b387f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8_null/var_int8_null.1.ast
+++ /dev/null

@@ -1,13 +0,0 @@
-DataverseUse test
-TypeDecl NumericType [
-  open RecordType {
-    id : integer,
-    int8Field : tinyint?,
-    int16Field : smallint?,
-    int32Field : integer?,
-    int64Field : bigint?,
-    floatField : float?,
-    doubleField : double?
-  }
-]
-DatasetDecl Numeric(NumericType)is an external dataset

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8_null/var_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8_null/var_int8_null.3.ast
deleted file mode 100644
index 186e2e3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_int8_null/var_int8_null.3.ast
+++ /dev/null

@@ -1,42 +0,0 @@
-DataverseUse test
-Query:
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [var_samp]
-    :
-    FunctionCall asterix.var_samp@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-  (
-    LiteralExpr [STRING] [var_pop]
-    :
-    FunctionCall asterix.var_pop@1[
-      (
-        SELECT ELEMENT [
-        FieldAccessor [
-          Variable [ Name=$x ]
-          Field=int8Field
-        ]
-        ]
-        FROM [          FunctionCall asterix.dataset@1[
-            LiteralExpr [STRING] [test.Numeric]
-          ]
-          AS Variable [ Name=$x ]
-        ]
-      )
-    ]
-  )
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_mixed/var_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_mixed/var_mixed.3.ast
deleted file mode 100644
index 4e0bd99..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_mixed/var_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.var_samp@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_pop_mixed/var_pop_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_pop_mixed/var_pop_mixed.3.ast
deleted file mode 100644
index 0756ce7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/var_pop_mixed/var_pop_mixed.3.ast
+++ /dev/null

@@ -1,22 +0,0 @@
-Query:
-SELECT ELEMENT [
-FunctionCall asterix.var_pop@1[
-  (
-    SELECT ELEMENT [
-    Variable [ Name=$x ]
-    ]
-    FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
-          LiteralExpr [STRING] [2.0]
-        ]
-        LiteralExpr [STRING] [hello world]
-        LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
-          LiteralExpr [STRING] [2013-01-01]
-        ]
-      ]
-      AS Variable [ Name=$x ]
-    ]
-  )
-]
-]

diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
index 4199a64..55f4962 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml

@@ -122,78 +122,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_mixed">
-        <output-dir compare="AST">stddev_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_mixed">
-        <output-dir compare="AST">serial_stddev_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_pop_mixed">
-        <output-dir compare="AST">stddev_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_pop_mixed">
-        <output-dir compare="AST">serial_stddev_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_mixed">
-        <output-dir compare="AST">var_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_mixed">
-        <output-dir compare="AST">serial_var_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_pop_mixed">
-        <output-dir compare="AST">var_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_pop_mixed">
-        <output-dir compare="AST">serial_var_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_mixed">
-        <output-dir compare="AST">kurtosis_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_mixed">
-        <output-dir compare="AST">serial_kurtosis_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_mixed">
-        <output-dir compare="AST">skewness_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_mixed">
-        <output-dir compare="AST">serial_skewness_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
       <compilation-unit name="agg_number">
         <output-dir compare="AST">agg_number</output-dir>
       </compilation-unit>
@@ -410,76 +338,6 @@
         </test-case>
         -->
     <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_double">
-        <output-dir compare="AST">kurtosis_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_double_null">
-        <output-dir compare="AST">kurtosis_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_empty_01">
-        <output-dir compare="AST">kurtosis_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_empty_02">
-        <output-dir compare="AST">kurtosis_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_float">
-        <output-dir compare="AST">kurtosis_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_float_null">
-        <output-dir compare="AST">kurtosis_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int16">
-        <output-dir compare="AST">kurtosis_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int16_null">
-        <output-dir compare="AST">kurtosis_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int32">
-        <output-dir compare="AST">kurtosis_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int32_null">
-        <output-dir compare="AST">kurtosis_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int64">
-        <output-dir compare="AST">kurtosis_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int64_null">
-        <output-dir compare="AST">kurtosis_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int8">
-        <output-dir compare="AST">kurtosis_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="kurtosis_int8_null">
-        <output-dir compare="AST">kurtosis_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
       <compilation-unit name="max_empty_01">
         <output-dir compare="AST">max_empty_01</output-dir>
       </compilation-unit>
@@ -530,21 +388,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_kurtosis">
-        <output-dir compare="AST">scalar_kurtosis</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_kurtosis_empty">
-        <output-dir compare="AST">scalar_kurtosis_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_kurtosis_null">
-        <output-dir compare="AST">scalar_kurtosis_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
       <compilation-unit name="scalar_max">
         <output-dir compare="AST">scalar_max</output-dir>
       </compilation-unit>
@@ -575,36 +418,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_skewness">
-        <output-dir compare="AST">scalar_skewness</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_skewness_empty">
-        <output-dir compare="AST">scalar_skewness_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_skewness_null">
-        <output-dir compare="AST">scalar_skewness_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_stddev">
-        <output-dir compare="AST">scalar_stddev</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_stddev_empty">
-        <output-dir compare="AST">scalar_stddev_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_stddev_null">
-        <output-dir compare="AST">scalar_stddev_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
       <compilation-unit name="scalar_sum">
         <output-dir compare="AST">scalar_sum</output-dir>
       </compilation-unit>
@@ -620,421 +433,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_var">
-        <output-dir compare="AST">scalar_var</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_var_empty">
-        <output-dir compare="AST">scalar_var_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="scalar_var_null">
-        <output-dir compare="AST">scalar_var_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_double">
-        <output-dir compare="AST">serial_kurtosis_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_double_null">
-        <output-dir compare="AST">serial_kurtosis_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_empty">
-        <output-dir compare="AST">serial_kurtosis_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_float">
-        <output-dir compare="AST">serial_kurtosis_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_float_null">
-        <output-dir compare="AST">serial_kurtosis_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int16">
-        <output-dir compare="AST">serial_kurtosis_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int16_null">
-        <output-dir compare="AST">serial_kurtosis_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int32">
-        <output-dir compare="AST">serial_kurtosis_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int32_null">
-        <output-dir compare="AST">serial_kurtosis_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int64">
-        <output-dir compare="AST">serial_kurtosis_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int64_null">
-        <output-dir compare="AST">serial_kurtosis_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int8">
-        <output-dir compare="AST">serial_kurtosis_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_kurtosis_int8_null">
-        <output-dir compare="AST">serial_kurtosis_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_double">
-        <output-dir compare="AST">serial_skewness_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_double_null">
-        <output-dir compare="AST">serial_skewness_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_empty">
-        <output-dir compare="AST">serial_skewness_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_float">
-        <output-dir compare="AST">serial_skewness_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_float_null">
-        <output-dir compare="AST">serial_skewness_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int16">
-        <output-dir compare="AST">serial_skewness_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int16_null">
-        <output-dir compare="AST">serial_skewness_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int32">
-        <output-dir compare="AST">serial_skewness_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int32_null">
-        <output-dir compare="AST">serial_skewness_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int64">
-        <output-dir compare="AST">serial_skewness_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int64_null">
-        <output-dir compare="AST">serial_skewness_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int8">
-        <output-dir compare="AST">serial_skewness_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_skewness_int8_null">
-        <output-dir compare="AST">serial_skewness_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_double">
-        <output-dir compare="AST">serial_stddev_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_double_null">
-        <output-dir compare="AST">serial_stddev_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_empty">
-        <output-dir compare="AST">serial_stddev_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_float">
-        <output-dir compare="AST">serial_stddev_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_float_null">
-        <output-dir compare="AST">serial_stddev_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int16">
-        <output-dir compare="AST">serial_stddev_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int16_null">
-        <output-dir compare="AST">serial_stddev_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int32">
-        <output-dir compare="AST">serial_stddev_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int32_null">
-        <output-dir compare="AST">serial_stddev_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int64">
-        <output-dir compare="AST">serial_stddev_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int64_null">
-        <output-dir compare="AST">serial_stddev_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int8">
-        <output-dir compare="AST">serial_stddev_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_stddev_int8_null">
-        <output-dir compare="AST">serial_stddev_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_double">
-        <output-dir compare="AST">serial_var_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_double_null">
-        <output-dir compare="AST">serial_var_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_empty">
-        <output-dir compare="AST">serial_var_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_float">
-        <output-dir compare="AST">serial_var_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_float_null">
-        <output-dir compare="AST">serial_var_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int16">
-        <output-dir compare="AST">serial_var_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int16_null">
-        <output-dir compare="AST">serial_var_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int32">
-        <output-dir compare="AST">serial_var_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int32_null">
-        <output-dir compare="AST">serial_var_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int64">
-        <output-dir compare="AST">serial_var_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int64_null">
-        <output-dir compare="AST">serial_var_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int8">
-        <output-dir compare="AST">serial_var_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="serial_var_int8_null">
-        <output-dir compare="AST">serial_var_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_double">
-        <output-dir compare="AST">skewness_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_double_null">
-        <output-dir compare="AST">skewness_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_empty_01">
-        <output-dir compare="AST">skewness_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_empty_02">
-        <output-dir compare="AST">skewness_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_float">
-        <output-dir compare="AST">skewness_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_float_null">
-        <output-dir compare="AST">skewness_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int16">
-        <output-dir compare="AST">skewness_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int16_null">
-        <output-dir compare="AST">skewness_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int32">
-        <output-dir compare="AST">skewness_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int32_null">
-        <output-dir compare="AST">skewness_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int64">
-        <output-dir compare="AST">skewness_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int64_null">
-        <output-dir compare="AST">skewness_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int8">
-        <output-dir compare="AST">skewness_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="skewness_int8_null">
-        <output-dir compare="AST">skewness_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_double">
-        <output-dir compare="AST">stddev_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_double_null">
-        <output-dir compare="AST">stddev_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_empty_01">
-        <output-dir compare="AST">stddev_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_empty_02">
-        <output-dir compare="AST">stddev_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_float">
-        <output-dir compare="AST">stddev_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_float_null">
-        <output-dir compare="AST">stddev_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int16">
-        <output-dir compare="AST">stddev_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int16_null">
-        <output-dir compare="AST">stddev_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int32">
-        <output-dir compare="AST">stddev_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int32_null">
-        <output-dir compare="AST">stddev_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int64">
-        <output-dir compare="AST">stddev_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int64_null">
-        <output-dir compare="AST">stddev_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int8">
-        <output-dir compare="AST">stddev_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="stddev_int8_null">
-        <output-dir compare="AST">stddev_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
       <compilation-unit name="sum_double">
         <output-dir compare="AST">sum_double</output-dir>
       </compilation-unit>
@@ -1114,76 +512,6 @@
         <output-dir compare="AST">sum_numeric_null</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_double">
-        <output-dir compare="AST">var_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_double_null">
-        <output-dir compare="AST">var_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_empty_01">
-        <output-dir compare="AST">var_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_empty_02">
-        <output-dir compare="AST">var_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_float">
-        <output-dir compare="AST">var_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_float_null">
-        <output-dir compare="AST">var_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int16">
-        <output-dir compare="AST">var_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int16_null">
-        <output-dir compare="AST">var_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int32">
-        <output-dir compare="AST">var_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int32_null">
-        <output-dir compare="AST">var_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int64">
-        <output-dir compare="AST">var_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int64_null">
-        <output-dir compare="AST">var_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int8">
-        <output-dir compare="AST">var_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate">
-      <compilation-unit name="var_int8_null">
-        <output-dir compare="AST">var_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
   </test-group>
   <test-group name="aggregate-sql">
     <test-case FilePath="aggregate-sql">
@@ -1230,78 +558,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_mixed">
-        <output-dir compare="AST">serial_stddev_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_mixed">
-        <output-dir compare="AST">stddev_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_pop_mixed">
-        <output-dir compare="AST">serial_stddev_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_pop_mixed">
-        <output-dir compare="AST">stddev_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_var_mixed">
-        <output-dir compare="AST">serial_var_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_mixed">
-        <output-dir compare="AST">var_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_var_pop_mixed">
-        <output-dir compare="AST">serial_var_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_pop_mixed">
-        <output-dir compare="AST">var_pop_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_mixed">
-        <output-dir compare="AST">serial_kurtosis_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_mixed">
-        <output-dir compare="AST">kurtosis_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_mixed">
-        <output-dir compare="AST">serial_skewness_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_mixed">
-        <output-dir compare="AST">skewness_mixed</output-dir>
-        <expected-error>org.apache.asterix.common.exceptions.AsterixException</expected-error>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
       <compilation-unit name="agg_number">
         <output-dir compare="AST">agg_number</output-dir>
       </compilation-unit>
@@ -1437,76 +693,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_double">
-        <output-dir compare="AST">kurtosis_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_double_null">
-        <output-dir compare="AST">kurtosis_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_empty_01">
-        <output-dir compare="AST">kurtosis_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_empty_02">
-        <output-dir compare="AST">kurtosis_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_float">
-        <output-dir compare="AST">kurtosis_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_float_null">
-        <output-dir compare="AST">kurtosis_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int16">
-        <output-dir compare="AST">kurtosis_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int16_null">
-        <output-dir compare="AST">kurtosis_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int32">
-        <output-dir compare="AST">kurtosis_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int32_null">
-        <output-dir compare="AST">kurtosis_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int64">
-        <output-dir compare="AST">kurtosis_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int64_null">
-        <output-dir compare="AST">kurtosis_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int8">
-        <output-dir compare="AST">kurtosis_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="kurtosis_int8_null">
-        <output-dir compare="AST">kurtosis_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
       <compilation-unit name="max_empty_01">
         <output-dir compare="AST">max_empty_01</output-dir>
       </compilation-unit>
@@ -1557,21 +743,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_kurtosis">
-        <output-dir compare="AST">scalar_kurtosis</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_kurtosis_empty">
-        <output-dir compare="AST">scalar_kurtosis_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_kurtosis_null">
-        <output-dir compare="AST">scalar_kurtosis_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
       <compilation-unit name="scalar_max">
         <output-dir compare="AST">scalar_max</output-dir>
       </compilation-unit>
@@ -1602,36 +773,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_skewness">
-        <output-dir compare="AST">scalar_skewness</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_skewness_empty">
-        <output-dir compare="AST">scalar_skewness_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_skewness_null">
-        <output-dir compare="AST">scalar_skewness_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_stddev">
-        <output-dir compare="AST">scalar_stddev</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_stddev_empty">
-        <output-dir compare="AST">scalar_stddev_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_stddev_null">
-        <output-dir compare="AST">scalar_stddev_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
       <compilation-unit name="scalar_sum">
         <output-dir compare="AST">scalar_sum</output-dir>
       </compilation-unit>
@@ -1647,356 +788,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_var">
-        <output-dir compare="AST">scalar_var</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_var_empty">
-        <output-dir compare="AST">scalar_var_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="scalar_var_null">
-        <output-dir compare="AST">scalar_var_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_double">
-        <output-dir compare="AST">serial_kurtosis_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_double_null">
-        <output-dir compare="AST">serial_kurtosis_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_empty">
-        <output-dir compare="AST">serial_kurtosis_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_float">
-        <output-dir compare="AST">serial_kurtosis_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_float_null">
-        <output-dir compare="AST">serial_kurtosis_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int16">
-        <output-dir compare="AST">serial_kurtosis_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int16_null">
-        <output-dir compare="AST">serial_kurtosis_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int32">
-        <output-dir compare="AST">serial_kurtosis_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int32_null">
-        <output-dir compare="AST">serial_kurtosis_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int64">
-        <output-dir compare="AST">serial_kurtosis_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int64_null">
-        <output-dir compare="AST">serial_kurtosis_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int8">
-        <output-dir compare="AST">serial_kurtosis_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_kurtosis_int8_null">
-        <output-dir compare="AST">serial_kurtosis_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_double">
-        <output-dir compare="AST">serial_skewness_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_double_null">
-        <output-dir compare="AST">serial_skewness_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_empty">
-        <output-dir compare="AST">serial_skewness_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_float">
-        <output-dir compare="AST">serial_skewness_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_float_null">
-        <output-dir compare="AST">serial_skewness_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int16">
-        <output-dir compare="AST">serial_skewness_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int16_null">
-        <output-dir compare="AST">serial_skewness_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int32">
-        <output-dir compare="AST">serial_skewness_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int32_null">
-        <output-dir compare="AST">serial_skewness_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int64">
-        <output-dir compare="AST">serial_skewness_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int64_null">
-        <output-dir compare="AST">serial_skewness_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int8">
-        <output-dir compare="AST">serial_skewness_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_skewness_int8_null">
-        <output-dir compare="AST">serial_skewness_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_double">
-        <output-dir compare="AST">serial_stddev_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_double_null">
-        <output-dir compare="AST">serial_stddev_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_empty">
-        <output-dir compare="AST">serial_stddev_empty</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_float">
-        <output-dir compare="AST">serial_stddev_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_float_null">
-        <output-dir compare="AST">serial_stddev_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int16">
-        <output-dir compare="AST">serial_stddev_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int16_null">
-        <output-dir compare="AST">serial_stddev_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int32">
-        <output-dir compare="AST">serial_stddev_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int32_null">
-        <output-dir compare="AST">serial_stddev_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int64">
-        <output-dir compare="AST">serial_stddev_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int64_null">
-        <output-dir compare="AST">serial_stddev_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int8">
-        <output-dir compare="AST">serial_stddev_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="serial_stddev_int8_null">
-        <output-dir compare="AST">serial_stddev_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_double">
-        <output-dir compare="AST">skewness_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_double_null">
-        <output-dir compare="AST">skewness_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_empty_01">
-        <output-dir compare="AST">skewness_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_empty_02">
-        <output-dir compare="AST">skewness_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_float">
-        <output-dir compare="AST">skewness_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_float_null">
-        <output-dir compare="AST">skewness_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int16">
-        <output-dir compare="AST">skewness_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int16_null">
-        <output-dir compare="AST">skewness_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int32">
-        <output-dir compare="AST">skewness_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int32_null">
-        <output-dir compare="AST">skewness_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int64">
-        <output-dir compare="AST">skewness_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int64_null">
-        <output-dir compare="AST">skewness_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int8">
-        <output-dir compare="AST">skewness_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="skewness_int8_null">
-        <output-dir compare="AST">skewness_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_double">
-        <output-dir compare="AST">stddev_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_double_null">
-        <output-dir compare="AST">stddev_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_empty_01">
-        <output-dir compare="AST">stddev_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_empty_02">
-        <output-dir compare="AST">stddev_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_float">
-        <output-dir compare="AST">stddev_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_float_null">
-        <output-dir compare="AST">stddev_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int16">
-        <output-dir compare="AST">stddev_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int16_null">
-        <output-dir compare="AST">stddev_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int32">
-        <output-dir compare="AST">stddev_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int32_null">
-        <output-dir compare="AST">stddev_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int64">
-        <output-dir compare="AST">stddev_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int64_null">
-        <output-dir compare="AST">stddev_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int8">
-        <output-dir compare="AST">stddev_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="stddev_int8_null">
-        <output-dir compare="AST">stddev_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
       <compilation-unit name="sum_double">
         <output-dir compare="AST">sum_double</output-dir>
       </compilation-unit>
@@ -2076,76 +867,6 @@
         <output-dir compare="AST">sum_numeric_null</output-dir>
       </compilation-unit>
     </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_double">
-        <output-dir compare="AST">var_double</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_double_null">
-        <output-dir compare="AST">var_double_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_empty_01">
-        <output-dir compare="AST">var_empty_01</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_empty_02">
-        <output-dir compare="AST">var_empty_02</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_float">
-        <output-dir compare="AST">var_float</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_float_null">
-        <output-dir compare="AST">var_float_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int16">
-        <output-dir compare="AST">var_int16</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int16_null">
-        <output-dir compare="AST">var_int16_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int32">
-        <output-dir compare="AST">var_int32</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int32_null">
-        <output-dir compare="AST">var_int32_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int64">
-        <output-dir compare="AST">var_int64</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int64_null">
-        <output-dir compare="AST">var_int64_null</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int8">
-        <output-dir compare="AST">var_int8</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="aggregate-sql">
-      <compilation-unit name="var_int8_null">
-        <output-dir compare="AST">var_int8_null</output-dir>
-      </compilation-unit>
-    </test-case>
   </test-group>
   <test-group name="boolean">
     <test-case FilePath="boolean">
@@ -7407,7 +6128,7 @@
       </compilation-unit>
     </test-case>
   </test-group>
-  <test-group>
+  <test-group name="big-object">
     <test-case FilePath="big-object">
       <compilation-unit name="big_object_sort">
         <output-dir compare="AST">big_object_sort</output-dir>
commit	24caa67712f78b763887d884263f994a0078a101	[log] [tgz]
author	Dmitry Lychagin <dmitry.lychagin@couchbase.com>	Fri Mar 15 15:50:34 2019 -0700
committer	Dmitry Lychagin <dmitry.lychagin@couchbase.com>	Mon Mar 18 11:14:20 2019 -0700
tree	7b750113563a39a235566141cd0eefdcb5965617
parent	e5ea42db0f0b0925db7da7b11e998e8c9733b9f5 [diff]