diff --git a/tests/cql/CqlAggregateFunctionsTest.xml b/tests/cql/CqlAggregateFunctionsTest.xml
index b6369f9..a6353d6 100644
--- a/tests/cql/CqlAggregateFunctionsTest.xml
+++ b/tests/cql/CqlAggregateFunctionsTest.xml
@@ -44,6 +44,11 @@
AllTrue(null)
+
+
+ AllTrue({null, null, null})
+
+
@@ -97,6 +102,11 @@
AnyTrue(null)
+
+
+ AnyTrue({null, null, null})
+
+
@@ -105,6 +115,21 @@
Avg({ 1.0, 2.0, 3.0, 6.0 })
+
+
+ Avg({ 1.0, null, 3.0 })
+
+
+
+
+ Avg({ null as Decimal, null as Decimal })
+
+
+
+
+ Avg(null as List<Decimal>)
+
+
@@ -114,6 +139,24 @@
Product({5L, 4L, 5L})
+
+ Product({ 2, 3, 4 })
+
+
+
+ Product({ 1.0, 2.0, 3.0, 4.0 })
+
+
+
+
+ Product({ null as Decimal, null as Decimal })
+
+
+
+
+ Product(null as List<Decimal>)
+
+
@@ -139,6 +182,16 @@
Count({})
+
+
+ Count({ null, null, null })
+
+
+
+
+ Count(null as List<Integer>)
+
+
@@ -170,6 +223,25 @@
Max({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999 })
+
+ Max({ 1.0, 5.0, 3.0 })
+
+
+
+
+ Max({ 1, null, 5 })
+
+
+
+
+ Max({ null as Quantity, null as Quantity, null as Quantity })
+
+
+
+
+ Max(null as List<Decimal>)
+
+
@@ -178,6 +250,19 @@
Median({6.0, 5.0, 4.0, 3.0, 2.0, 1.0})
+
+
+ Median({ 1.0, 2.0, 3.0 })
+
+
+
+ Median({ null as Quantity, null as Quantity, null as Quantity })
+
+
+
+ Median(null as List<Decimal>)
+
+
@@ -209,6 +294,18 @@
Min({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999 })
+
+ Min({ 5.0, 1.0, 3.0 })
+
+
+
+ Min({ null as Quantity, null as Quantity, null as Quantity })
+
+
+
+ Min(null as List<Decimal>)
+
+
@@ -235,6 +332,14 @@
Mode({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999, @T05:59:59.999 })
+
+ Mode({ null as Quantity, null as Quantity, null as Quantity })
+
+
+
+ Mode(null as List<Decimal>)
+
+
@@ -249,6 +354,11 @@
PopulationStdDev({ null as Quantity, null as Quantity, null as Quantity })
+
+
+ PopulationStdDev(null as List<Decimal>)
+
+
@@ -262,6 +372,11 @@
PopulationVariance({ null as Quantity, null as Quantity, null as Quantity })
+
+
+ PopulationVariance(null as List<Decimal>)
+
+
@@ -276,6 +391,11 @@
StdDev({ null as Quantity, null as Quantity, null as Quantity })
+
+
+ StdDev(null as List<Decimal>)
+
+
@@ -301,6 +421,20 @@
Sum({ null, 1, null })
+
+ Sum({ 1, 2, 3 })
+
+
+
+
+ Sum({ null as Decimal, null as Decimal })
+
+
+
+
+ Sum(null as List<Decimal>)
+
+
@@ -309,5 +443,31 @@
Variance({ 1.0, 2.0, 3.0, 4.0, 5.0 })
+
+ Variance({ null as Quantity, null as Quantity, null as Quantity })
+
+
+
+
+ Variance(null as List<Decimal>)
+
+
+
+
+
+
+
+ GeometricMean({ 2.0, 8.0 })
+
+
+
+ GeometricMean({ null as Decimal, null as Decimal })
+
+
+
+
+ GeometricMean(null as List<Decimal>)
+
+