diff --git a/asterix-app/src/test/resources/AQLTS/queries-sql-like/2.aql b/asterix-app/src/test/resources/AQLTS/queries-sql-like/2.aql
index d094e7e..c5199e6 100644
--- a/asterix-app/src/test/resources/AQLTS/queries-sql-like/2.aql
+++ b/asterix-app/src/test/resources/AQLTS/queries-sql-like/2.aql
@@ -1,11 +1,11 @@
 from $event in dataset('Event')
 from $sponsor in $event.sponsoring_sigs
 with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
+group by $sig_name := $sponsor.sig_name keeping $es
 with $sig_sponsorship_count := count($es)
 with $by_chapter :=
    from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
+   group by $chapter_name := $e.sponsor.chapter_name keeping $es
    select { "chapter_name": $chapter_name, "escount" : count($es) }
 order by $sig_sponsorship_count desc
 limit 5
diff --git a/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql b/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql
index 9a77c84..c9e9231 100644
--- a/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql
+++ b/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql
@@ -2,11 +2,11 @@
 from $event in $events
 from $sponsor in $event.sponsoring_sigs
 with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
+group by $sig_name := $sponsor.sig_name keeping $es
 with $sig_sponsorship_count := count($es)
 with $by_chapter :=
    from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
+   group by $chapter_name := $e.sponsor.chapter_name keeping $es
    select { "chapter_name": $chapter_name, "escount" : count($es) }
 order by $sig_sponsorship_count desc
 limit 5
diff --git a/asterix-app/src/test/resources/AQLTS/queries-sql-like/nestedFLWOGR3.aql b/asterix-app/src/test/resources/AQLTS/queries-sql-like/nestedFLWOGR3.aql
index 0f5fa5f..2cb9b22 100644
--- a/asterix-app/src/test/resources/AQLTS/queries-sql-like/nestedFLWOGR3.aql
+++ b/asterix-app/src/test/resources/AQLTS/queries-sql-like/nestedFLWOGR3.aql
@@ -1,11 +1,11 @@
 from $event in dataset('Event')
 from $sponsor in $event.sponsoring_sigs
 with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
+group by $sig_name := $sponsor.sig_name keeping $es
 with $sig_sponsorship_count := count($es)
 with $by_chapter :=
    from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
+   group by $chapter_name := $e.sponsor.chapter_name keeping $es
    select { "chapter_name": $chapter_name, "escount" : count($es) }
 order by $sig_sponsorship_count desc
 limit 5 offset 2