diff --git a/tests/cql/CqlArithmeticFunctionsTest.xml b/tests/cql/CqlArithmeticFunctionsTest.xml
index ff1a881..2de2993 100644
--- a/tests/cql/CqlArithmeticFunctionsTest.xml
+++ b/tests/cql/CqlArithmeticFunctionsTest.xml
@@ -40,6 +40,10 @@
 			<expression>1 + 1</expression>
 			<output>2</output>
 		</test>
+		<test name="Add1L2L">
+			<expression>1L + 2L</expression>
+			<output>3L</output>
+		</test>
 		<test name="Add1D1D">
 			<expression>1.0 + 1.0</expression>
 			<output>2.0</output>
@@ -104,6 +108,10 @@
 			<expression>1 / 1</expression>
 			<output>1.0</output>
 		</test>
+		<test name="Divide1L1L">
+			<expression>1L / 1L</expression>
+			<output>1.0</output>
+		</test>
 		<test name="Divide1d1d">
 			<expression>1.0 / 1.0</expression>
 			<output>1.0</output>
@@ -195,6 +203,10 @@
 			<expression>Round(Exp(1), 8)</expression>
 			<output>2.71828183</output>
 		</test>
+		<test name="Exp1L">
+			<expression>Round(Exp(1L), 8)</expression>
+			<output>2.71828183</output>
+		</test>
 		<test name="ExpNeg1">
 			<expression>Round(Exp(-1), 8)</expression>
 			<output>0.36787944</output>
@@ -239,6 +251,10 @@
 			<expression>Log(1, 1)</expression>
 			<output>null</output>
 		</test>
+		<test name="Log2Base1">
+			<expression>Log(2, 1)</expression>
+			<output>null</output>
+		</test>
 		<test name="Log1Base2">
 			<expression>Log(1, 2)</expression>
 			<output>0.0</output>
@@ -247,6 +263,10 @@
 			<expression>Log(1, 100)</expression>
 			<output>0.0</output>
 		</test>
+		<test name="Log1Base100L">
+			<expression>Log(1L, 100L)</expression>
+			<output>0.0</output>
+		</test>
 		<test name="Log16Base2">
 			<expression>Log(16, 2)</expression>
 			<output>4.0</output>
@@ -291,6 +311,10 @@
 			<expression>Ln(1)</expression>
 			<output>0.0</output>
 		</test>
+		<test name="Ln1L">
+			<expression>Ln(1L)</expression>
+			<output>0.0</output>
+		</test>
 		<test name="LnNeg1">
 			<expression>Ln(-1)</expression>
 			<output>null</output>
@@ -400,6 +424,14 @@
 			<expression>3.5 'cm' mod 3 'cm'</expression>
 			<output>0.5 'cm'</output>
 		</test>
+		<test name="Modulo10By3Quantity">
+			<expression>10.0 'g' mod 3.0 'g'</expression>
+			<output>1.0 'g'</output>
+		</test>
+		<test name="Modulo10By0Quantity">
+			<expression>10.0 'g' mod 0.0 'g'</expression>
+			<output>null</output>
+		</test>
 	</group>
 	<group name="Multiply">
 		<test name="MultiplyNull">
@@ -410,6 +442,10 @@
 			<expression>1 * 1</expression>
 			<output>1</output>
 		</test>
+		<test name="Multiply2LBy3L">
+			<expression>2L * 3L</expression>
+			<output>6L</output>
+		</test>
 		<test name="Multiply1DBy2D">
 			<expression>1.0 * 2.0</expression>
 			<output>2.0</output>
@@ -445,6 +481,14 @@
 			<expression>-1</expression>
 			<output>-1</output>
 		</test>
+		<test name="Negate1L">
+			<expression>-1L</expression>
+			<output>-1L</output>
+		</test>
+		<test name="NegateMaxLong">
+			<expression>-9223372036854775807L</expression>
+			<output>-9223372036854775807L</output>
+		</test>
 		<test name="NegateNeg1">
 			<expression>-(-1)</expression>
 			<output>1</output>
@@ -591,6 +635,10 @@
 			<expression>2^4</expression>
 			<output>16</output>
 		</test>
+		<test name="Power2LTo3L">
+			<expression>2L^3L</expression>
+			<output>8L</output>
+		</test>
 		<test name="Power2DTo4D">
 			<expression>2.0^4.0</expression>
 			<output>16.0</output>
@@ -829,5 +877,17 @@
 			<expression>10.1 'cm' div -3.1 'cm'</expression>
 			<output>-3.0 'cm'</output>
 		</test>
+		<test name="TruncatedDivide10By5DQuantity">
+			<expression>10.0 'g' div 5.0 'g'</expression>
+			<output>2.0 'g'</output>
+		</test>
+		<test name="TruncatedDivide414By206DQuantity">
+			<expression>4.14 'm' div 2.06 'm'</expression>
+			<output>2.0 'm'</output>
+		</test>
+		<test name="TruncatedDivide10By0DQuantity">
+			<expression>10.0 'g' div 0.0 'g'</expression>
+			<output>null</output>
+		</test>
 	</group>
 </tests>