diff --git a/tests/cql/CqlIntervalOperatorsTest.xml b/tests/cql/CqlIntervalOperatorsTest.xml
index 64c8e2b..6e60f12 100644
--- a/tests/cql/CqlIntervalOperatorsTest.xml
+++ b/tests/cql/CqlIntervalOperatorsTest.xml
@@ -533,7 +533,17 @@
-
+
+
+ Interval[1, 10] ends null
+
+
+
+
+ Interval[1, 10] ends Interval[null, null]
+
+
+
Interval[1, 10] ends Interval(null, null)
@@ -649,11 +659,16 @@
-
+
Interval[null, null] except Interval[null, null]
+
+
+ Interval[1, 1] except Interval[1, 1]
+
+
Interval[1, 10] except Interval[4, 10]
@@ -707,10 +722,15 @@
-
+
5 in Interval[null, null]
-
+
+
+
+
+ 5 in Interval(null, null)
+
@@ -1359,9 +1379,14 @@
-
+
Interval[null, null] overlaps Interval[1, 10]
+
+
+
+
+ Interval(null, null) overlaps Interval[1, 10]
@@ -1497,9 +1522,14 @@
-
+
Interval[null, null] overlaps before Interval[1, 10]
+
+
+
+
+ Interval(null, null) overlaps before Interval[1, 10]
@@ -1596,9 +1626,14 @@
-
+
Interval[null, null] overlaps after Interval[1, 10]
+
+
+
+
+ Interval(null, null) overlaps after Interval[1, 10]
@@ -1697,7 +1732,16 @@
- point from Interval[null, null]
+ point from (null as Interval<Integer>)
+
+
+
+
+ point from Interval[null, null]
+
+
+
+ point from Interval(null, null)
@@ -1842,7 +1886,7 @@
-
+
Interval[1, 10] properly included in Interval[null, null]
@@ -1928,9 +1972,19 @@
-
+
+
+ null starts Interval[1, 10]
+
+
+
Interval[null, null] starts Interval[1, 10]
+
+
+
+
+ Interval(null, null) starts Interval[1, 10]
@@ -1986,9 +2040,14 @@
-
+
Interval[null, null] union Interval[1, 10]
+
+
+
+
+ Interval(null, null) union Interval[1, 10]