diff --git a/tests/cql/CqlTypesTest.xml b/tests/cql/CqlTypesTest.xml
index 53df4b8..bd36ba1 100644
--- a/tests/cql/CqlTypesTest.xml
+++ b/tests/cql/CqlTypesTest.xml
@@ -64,6 +64,37 @@
-->
+
+
+
+
+ @2016-07-07
+
+
+
+
+
+ @2014-02
+
+
+
+
+
+ @2014
+
+
+
+
+
+ @0001-01-01
+
+
+
+
+ @9999-12-31
+
+
+
@@ -155,6 +186,30 @@
+
+
+
+
+
+
+
+ 3000000000L
+
+
+
+
+
+
+ 9223372036854775807L
+
+
+
+
+
+
+ 9223372036854775808L
+
+
diff --git a/tests/cql/ValueLiteralsAndSelectors.xml b/tests/cql/ValueLiteralsAndSelectors.xml
index 8317b89..2b4e3c9 100644
--- a/tests/cql/ValueLiteralsAndSelectors.xml
+++ b/tests/cql/ValueLiteralsAndSelectors.xml
@@ -380,7 +380,17 @@
-
+
+
+ 'Hello, World!'
+
+
+
+
+
+ ''
+
+
@@ -389,7 +399,22 @@
-
+
+
+
+ @2015-02-04T
+
+
+
+
+ @2015-02-04T14:30
+
+
+
+
+ @2015-02-04T14:30:25.900
+
+
@@ -398,15 +423,48 @@
-
+
+
+ @T14:30
+
+
+
+
+ @T14:30:25.900
+
+
-
+
+
+ {4, 5, 6}
+
+
+
+
+ {'a', 'b', 'c'}
+
+
+
+
+
+ {1, null, 3}
+
+
-
+
+
+ Interval[1, 10]
+
+
+
+
+ Interval[1.0, 10.0]
+
+