diff --git a/tests/cql/CqlListOperatorsTest.xml b/tests/cql/CqlListOperatorsTest.xml
index f765522..f7d63bf 100644
--- a/tests/cql/CqlListOperatorsTest.xml
+++ b/tests/cql/CqlListOperatorsTest.xml
@@ -475,10 +475,9 @@
 			<expression>null as List&lt;Integer&gt; includes {2}</expression>
 			<output>null</output>
 		</test>
-		<!-- this test is going to the ContainsEvaluator -->
 		<test name="IncludesNullRight" version="1.0">
 			<capability code="list-operators" />
-			<expression>{'s', 'a', 'm'} includes null</expression>
+			<expression>{'s', 'a', 'm'} includes null as List&lt;String&gt;</expression>
 			<output>null</output>
 		</test>
 	</group>
@@ -529,10 +528,9 @@
 			<expression>@T16:59:59.999 included in { @T02:29:15.156, @T15:59:59.999, @T20:59:59.999 }</expression>
 			<output>false</output>
 		</test>
-		<!-- the following expression is going to the InEvaluator -->
 		<test name="IncludedInNullLeft" version="1.0">
 			<capability code="list-operators" />
-			<expression>null included in {2}</expression>
+			<expression>null as List&lt;Integer&gt; included in {2}</expression>
 			<output>null</output>
 		</test>
 		<test name="IncludedInNullRight" version="1.0">
@@ -868,17 +866,17 @@
 		</test>
 		<test name="ProperContainsNullRightFalse" version="1.0">
 			<capability code="list-operators" />
-			<expression>{'s', 'u', 'n'} properly includes null</expression>
+			<expression>{'s', 'u', 'n'} properly includes null as String</expression>
 			<output>false</output>
 		</test>
 		<test name="ProperContains5" version="1.0">
 			<capability code="list-operators" />
 			<expression>{ null, null } properly includes null as String</expression>
-			<output>false</output>
+			<output>true</output>
 		</test>
 		<test name="ProperContainsNullRightTrue" version="1.0">
 			<capability code="list-operators" />
-			<expression>{'s', 'u', 'n', null} properly includes null</expression>
+			<expression>{'s', 'u', 'n', null} properly includes null as String</expression>
 			<output>true</output>
 		</test>
 		<test name="ProperContains6" version="1.0">
@@ -889,7 +887,7 @@
 		<test name="ProperContains7" version="1.0">
 			<capability code="list-operators" />
 			<expression>{ 'a', 'a' } properly includes 'a'</expression>
-			<output>false</output>
+			<output>true</output>
 		</test>
 		<test name="ProperContains8" version="1.0">
 			<capability code="list-operators" />
@@ -899,7 +897,7 @@
 		<test name="ProperContains9" version="1.0">
 			<capability code="list-operators" />
 			<expression>{ 'a', null } properly includes 'a'</expression>
-			<output>null</output>
+			<output>true</output>
 		</test>
 		<test name="ProperContains10" version="1.0">
 			<capability code="list-operators" />
@@ -914,7 +912,7 @@
 		<test name="ProperContainsTimeNull" version="1.0">
 			<capability code="list-operators" />
 			<expression>{ @T15:59:59.999, @T20:59:59.999, @T20:59:49.999 } properly includes @T15:59:59</expression>
-			<output>null</output>
+			<output>false</output>
 		</test>
 	</group>
 	<group name="ProperIn" version="1.0">
@@ -941,13 +939,13 @@
 		</test>
 		<test name="ProperInNullRightFalse" version="1.0">
 			<capability code="list-operators" />
-			<expression>null properly included in {'s', 'u', 'n'}</expression>
+			<expression>null as String properly included in {'s', 'u', 'n'}</expression>
 			<output>false</output>
 		</test>
 		<test name="ProperIn5" version="1.0">
 			<capability code="list-operators" />
 			<expression>null as String properly included in { null, null }</expression>
-			<output>false</output>
+			<output>true</output>
 		</test>
 		<test name="ProperInNullRightTrue" version="1.0">
 			<capability code="list-operators" />
@@ -962,7 +960,7 @@
 		<test name="ProperIn7" version="1.0">
 			<capability code="list-operators" />
 			<expression>'a' properly included in { 'a', 'a' }</expression>
-			<output>false</output>
+			<output>true</output>
 		</test>
 		<test name="ProperIn8" version="1.0">
 			<capability code="list-operators" />
@@ -972,7 +970,7 @@
 		<test name="ProperIn9" version="1.0">
 			<capability code="list-operators" />
 			<expression>'a' properly included in { 'a', null }</expression>
-			<output>null</output>
+			<output>true</output>
 		</test>
 		<test name="ProperIn10" version="1.0">
 			<capability code="list-operators" />
@@ -987,7 +985,7 @@
 		<test name="ProperInTimeNull" version="1.0">
 			<capability code="list-operators" />
 			<expression>@T15:59:59 properly included in { @T15:59:59.999, @T20:59:59.999, @T20:59:49.999 }</expression>
-			<output>null</output>
+			<output>false</output>
 		</test>
 	</group>
 	<group name="ProperlyIncludes" version="1.0">
@@ -1039,7 +1037,7 @@
 		</test>
 		<test name="ProperlyIncludesNullLeft" version="1.0">
 			<capability code="list-operators" />
-			<expression>null properly includes {2}</expression>
+			<expression>null as List&lt;Integer&gt; properly includes {2}</expression>
 			<output>null</output>
 		</test>
 	</group>
@@ -1092,7 +1090,7 @@
 		</test>
 		<test name="ProperlyIncludedInNulRight" version="1.0">
 			<capability code="list-operators" />
-			<expression>{'s', 'u', 'n'} properly included in null</expression>
+			<expression>{'s', 'u', 'n'} properly included in null as List&lt;String&gt;</expression>
 			<output>null</output>
 		</test>
 	</group>