diff --git a/tests/cql/CqlIntervalOperatorsTest.xml b/tests/cql/CqlIntervalOperatorsTest.xml
index 64c8e2b..d5be7c3 100644
--- a/tests/cql/CqlIntervalOperatorsTest.xml
+++ b/tests/cql/CqlIntervalOperatorsTest.xml
@@ -709,8 +709,9 @@
+
5 in Interval[null, null]
-
+
@@ -1141,22 +1142,22 @@
- Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)] meets Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 25)]
+ Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)] meets before Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 25)]
- Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)] meets Interval[DateTime(2012, 1, 20), DateTime(2012, 1, 25)]
+ Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)] meets before Interval[DateTime(2012, 1, 20), DateTime(2012, 1, 25)]
- Interval[@T04:59:59.999, @T09:59:59.999] meets Interval[@T10:00:00.000, @T19:59:59.999]
+ Interval[@T04:59:59.999, @T09:59:59.999] meets before Interval[@T10:00:00.000, @T19:59:59.999]
- Interval[@T04:59:59.999, @T09:59:59.999] meets Interval[@T10:12:00.000, @T19:59:59.999]
+ Interval[@T04:59:59.999, @T09:59:59.999] meets before Interval[@T10:12:00.000, @T19:59:59.999]
@@ -1164,8 +1165,9 @@
+
Interval(null, 5] meets after Interval[11, null)
-
+
@@ -1199,22 +1201,22 @@
- Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 25)] meets Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)]
+ Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 25)] meets after Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)]
- Interval[DateTime(2012, 1, 20), DateTime(2012, 1, 25)] meets Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)]
+ Interval[DateTime(2012, 1, 20), DateTime(2012, 1, 25)] meets after Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)]
- Interval[@T10:00:00.000, @T19:59:59.999] meets Interval[@T04:59:59.999, @T09:59:59.999]
+ Interval[@T10:00:00.000, @T19:59:59.999] meets after Interval[@T04:59:59.999, @T09:59:59.999]
- Interval[@T10:12:00.000, @T19:59:59.999] meets Interval[@T04:59:59.999, @T09:59:59.999]
+ Interval[@T10:12:00.000, @T19:59:59.999] meets after Interval[@T04:59:59.999, @T09:59:59.999]
@@ -1575,22 +1577,22 @@
- Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] overlaps Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 28)]
+ Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] overlaps before Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 28)]
- Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] overlaps Interval[DateTime(2012, 1, 26), DateTime(2012, 1, 28)]
+ Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] overlaps before Interval[DateTime(2012, 1, 26), DateTime(2012, 1, 28)]
- Interval[@T10:00:00.000, @T19:59:59.999] overlaps Interval[@T12:00:00.000, @T21:59:59.999]
+ Interval[@T10:00:00.000, @T19:59:59.999] overlaps before Interval[@T12:00:00.000, @T21:59:59.999]
- Interval[@T10:00:00.000, @T19:59:59.999] overlaps Interval[@T20:00:00.000, @T21:59:59.999]
+ Interval[@T10:00:00.000, @T19:59:59.999] overlaps before Interval[@T20:00:00.000, @T21:59:59.999]
@@ -1674,22 +1676,22 @@
- Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 28)] overlaps Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)]
+ Interval[DateTime(2012, 1, 15), DateTime(2012, 1, 28)] overlaps after Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)]
- Interval[DateTime(2012, 1, 26), DateTime(2012, 1, 28)] overlaps Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)]
+ Interval[DateTime(2012, 1, 26), DateTime(2012, 1, 28)] overlaps after Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)]
- Interval[@T12:00:00.000, @T21:59:59.999] overlaps Interval[@T10:00:00.000, @T19:59:59.999]
+ Interval[@T12:00:00.000, @T21:59:59.999] overlaps after Interval[@T10:00:00.000, @T19:59:59.999]
- Interval[@T20:00:00.000, @T21:59:59.999] overlaps Interval[@T10:00:00.000, @T19:59:59.999]
+ Interval[@T20:00:00.000, @T21:59:59.999] overlaps after Interval[@T10:00:00.000, @T19:59:59.999]
@@ -1697,8 +1699,8 @@
- point from Interval[null, null]
-
+
+ point from Interval[null, null]
@@ -2066,10 +2068,12 @@
+
width of Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)]
+
width of Interval[@T05:59:59.999, @T15:59:59.999]
@@ -2167,13 +2171,52 @@
+
Interval[5, 3]
-
+
Interval[5, 5)
-
+
+
+
+
+
+
+
+ Size(Interval[3, 7])
+
+
+
+
+
+ Size(Interval[3, 8))
+
+
+
+
+ Size(null as Interval<Integer>)
+
+
+
+
+
+
+
+ Interval[0, 5] !~ Interval[0, 5]
+
+
+
+
+
+ Interval[1, null] !~ Interval[1, null]
+
+
+
+
+ Interval[-1, 7] !~ Interval[0, 7]
+