diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java b/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java
index f70bfb03d..3013abda3 100644
--- a/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java
+++ b/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java
@@ -167,15 +167,13 @@ public static Object[][] dataMethod() {
         "cql/CqlTypesTest/DateTime/DateTimeUncertain",
         "cql/CqlTypesTest/Time/TimeUpperBoundMillis",
 
-        "cql/ValueLiteralsAndSelectors/Boolean/BooleanFalse",
-        "cql/ValueLiteralsAndSelectors/Boolean/BooleanTrue",
+
         "cql/ValueLiteralsAndSelectors/Decimal/Decimal10Pow28",
         "cql/ValueLiteralsAndSelectors/Decimal/DecimalNeg10Pow28",
         "cql/ValueLiteralsAndSelectors/Decimal/DecimalNegTenthStep",
         "cql/ValueLiteralsAndSelectors/Decimal/DecimalPos10Pow28",
         "cql/ValueLiteralsAndSelectors/Decimal/DecimalPosTenthStep",
         "cql/ValueLiteralsAndSelectors/Decimal/DecimalTenthStep",
-        "cql/ValueLiteralsAndSelectors/Null/Null",
 
         "r4/tests-fhir-r4/from-Zulip/(true and 'foo').empty()",
         "r4/tests-fhir-r4/from-Zulip/(true | 'foo').allTrue()",
diff --git a/engine.fhir/src/test/resources/org/hl7/fhirpath/cql/ValueLiteralsAndSelectors.xml b/engine.fhir/src/test/resources/org/hl7/fhirpath/cql/ValueLiteralsAndSelectors.xml
index 8efd879b2..09346b644 100644
--- a/engine.fhir/src/test/resources/org/hl7/fhirpath/cql/ValueLiteralsAndSelectors.xml
+++ b/engine.fhir/src/test/resources/org/hl7/fhirpath/cql/ValueLiteralsAndSelectors.xml
@@ -6,7 +6,7 @@
 	<group name="Null">
 		<test name="Null">
 			<expression>null</expression>
-			<output>@2000 &lt; @2000-01</output>
+			<output>null</output>
 		</test>
 	</group>
 	<!-- CQL spec section 3.1.3 Literals:
@@ -16,11 +16,11 @@
 	<group name="Boolean">
 		<test name="BooleanFalse">
 			<expression>false</expression>
-			<output>1~0</output>
+			<output>(1~0)</output>
 		</test>
 		<test name="BooleanTrue">
 			<expression>true</expression>
-			<output>1~1</output>
+			<output>(1~1)</output>
 		</test>
 	</group>
 	<!-- CQL spec section 3.1.3 Literals: