diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.3.query.sqlpp
index abf6092..6664c91 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.3.query.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.3.query.sqlpp
@@ -19,5 +19,5 @@
 
 USE TinySocial;
 
-SELECT count(u.friend_ids) count
+SELECT count(u."friend-ids") count
 FROM FacebookUsers u;
diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.3.query.sqlpp
index 9c00dac..1204809 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.3.query.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.3.query.sqlpp
@@ -19,5 +19,5 @@
 
 USE TinySocial;
 
-SELECT 1 foo, COUNT(u.friend_ids) count
+SELECT 1 foo, COUNT(u."friend-ids") count
 FROM FacebookUsers u;
diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.3.query.sqlpp
index 2cb755a..7922734 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.3.query.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.3.query.sqlpp
@@ -19,5 +19,5 @@
 
 USE TinySocial;
 
-SELECT u.name name, COUNT(u.friend_ids) count
+SELECT u.name name, COUNT(u."friend-ids") count
 FROM FacebookUsers u;
diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.3.query.sqlpp
index d333752..9ff9b65 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.3.query.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.3.query.sqlpp
@@ -19,5 +19,6 @@
 
 USE TinySocial;
 
-SELECT COLL_COUNT(u.friend_ids) count
-FROM FacebookUsers u;
+SELECT COLL_COUNT(u."friend-ids") count
+FROM FacebookUsers u
+ORDER BY u.id;
diff --git a/asterix-app/src/test/resources/runtimets/results/global-aggregate/q08/q08.1.adm b/asterix-app/src/test/resources/runtimets/results/global-aggregate/q08/q08.1.adm
index c61d241..e45bb55 100644
--- a/asterix-app/src/test/resources/runtimets/results/global-aggregate/q08/q08.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/global-aggregate/q08/q08.1.adm
@@ -1,10 +1,10 @@
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
-{ "count": 0 }
+{ "count": 4 }
+{ "count": 2 }
+{ "count": 4 }
+{ "count": 1 }
+{ "count": 3 }
+{ "count": 3 }
+{ "count": 1 }
+{ "count": 1 }
+{ "count": 2 }
+{ "count": 3 }