Index: vhUnitTest/TECH/ClassUtilsTestObject.cls.xml
===================================================================
diff -u -r957 -r1781
--- vhUnitTest/TECH/ClassUtilsTestObject.cls.xml	(.../ClassUtilsTestObject.cls.xml)	(revision 957)
+++ vhUnitTest/TECH/ClassUtilsTestObject.cls.xml	(.../ClassUtilsTestObject.cls.xml)	(revision 1781)
@@ -6,13 +6,13 @@
 <Super>%RegisteredObject</Super>
 
 <Property name="Required">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Required>1</Required>
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="ValueList">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Parameter name="TRUNCATE" value="1"/>
 <Parameter name="VALUELIST" value=",ValidValue"/>
 </Property>
@@ -23,7 +23,7 @@
 </Property>
 
 <Property name="Calculated">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Calculated>1</Calculated>
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
Index: vhUnitTest/TECH/ClassUtils.cls.xml
===================================================================
diff -u -r957 -r1781
--- vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 957)
+++ vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1781)
@@ -46,59 +46,87 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestMethodReturnTypeValidation">
+<Method name="TestMethodReturnTypeValidation_IntegerCheck1">
+<Implementation><![CDATA[	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_IntegerCheck2">
 <Implementation><![CDATA[
-	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
 	
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_IntegerCheck3">
+<Implementation><![CDATA[
 	
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+]]></Implementation>
+</Method>
 
+<Method name="TestMethodReturnTypeValidation_IntegerCheck4">
+<Implementation><![CDATA[	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("1-3","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+]]></Implementation>
+</Method>
 
-	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("1-3","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
-			
-	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
-	
-	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
-	
-	
-	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
-	
+<Method name="TestMethodReturnTypeValidation_FloatCheck1">
+<Implementation><![CDATA[	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_FloatCheck2">
+<Implementation><![CDATA[	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_FloatCheck3">
+<Implementation><![CDATA[	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_ObjectCheck1">
+<Implementation><![CDATA[
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required = "required"
 	
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 1")
-	
-	
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_ObjectCheck2">
+<Implementation><![CDATA[
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.ValueList=""
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 2")
+]]></Implementation>
+</Method>
 
+<Method name="TestMethodReturnTypeValidation_ObjectCheck3">
+<Implementation><![CDATA[
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="InvalidValue"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 3")
-	
+]]></Implementation>
+</Method>
+
+<Method name="TestMethodReturnTypeValidation_ObjectCheck4">
+<Implementation><![CDATA[
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="ValidValue"
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 4")
+]]></Implementation>
+</Method>
 
+<Method name="TestMethodReturnTypeValidation_ObjectCheck5">
+<Implementation><![CDATA[
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="ValidValue"
 	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 5")
-
-	
-	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
-	set obj.Required="required"
-	set obj.ValueList="ValidValue"
-	do obj.Array.SetAt(15.5,"OnGeldigeIntegerWaarde")
-	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
-	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 6")
-	
-	quit
 ]]></Implementation>
 </Method>