diff --git a/tests/cql/CqlTypeOperatorsTest.xml b/tests/cql/CqlTypeOperatorsTest.xml
index 64bff23..9ae00fa 100644
--- a/tests/cql/CqlTypeOperatorsTest.xml
+++ b/tests/cql/CqlTypeOperatorsTest.xml
@@ -79,6 +79,50 @@
ToBoolean('NO')
+
+
+ ToBoolean('true')
+
+
+
+
+
+ ToBoolean('y')
+
+
+
+
+ ToBoolean('1')
+
+
+
+
+ ToBoolean('0')
+
+
+
+
+
+ ToBoolean('falsetto')
+
+
+
+
+
+ ToBoolean(null)
+
+
+
+
+
+ ToBoolean(1)
+
+
+
+
+ ToBoolean(0)
+
+
@@ -91,6 +135,49 @@
}
+
+
+
+ ToConcept(null as Code)
+
+
+
+
+
+
+
+ ToDate('2014-01-01')
+
+
+
+
+
+ ToDate('2014-01')
+
+
+
+
+ ToDate('2014')
+
+
+
+
+
+ ToDate('2014-01-01T12:05:05.955')
+
+
+
+
+
+ ToDate(DateTime(2014, 01, 01, 12, 30, 0, 0))
+
+
+
+
+
+ ToDate('2014/01/01')
+
+
@@ -147,6 +234,32 @@
ToDecimal('+25.5')
+
+
+ ToDecimal('-25.5')
+
+
+
+
+
+ ToDecimal('foo')
+
+
+
+
+
+
+
+
+ ToRatio('1.0 \'mg\':2.0 \'mg\'') is Ratio
+
+
+
+
+
+ ToRatio('1.0 \'mg\';2.0 \'mg\'')
+
+
@@ -155,6 +268,40 @@
ToInteger('-25')
+
+
+
+ ToInteger('+25')
+
+
+
+
+
+ ToInteger('foo')
+
+
+
+
+
+ ToInteger(true)
+
+
+
+
+
+
+
+
+ ToLong('-1')
+
+
+
+
+
+
+ ToLong('one')
+
+