Index: vhUnitTest/Res/TestEnumeration.cls.xml
===================================================================
diff -u -r29059 -r40119
--- vhUnitTest/Res/TestEnumeration.cls.xml	(.../TestEnumeration.cls.xml)	(revision 29059)
+++ vhUnitTest/Res/TestEnumeration.cls.xml	(.../TestEnumeration.cls.xml)	(revision 40119)
@@ -3,6 +3,23 @@
 <Class name="vhUnitTest.Res.TestEnumeration">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	#dim Counter As %Integer = ""
+	for Counter = 1 : 1 : 5 { 
+		set ^RES("UT","PI","UT","D","UT"_Counter) = Counter_"`"_"UnitTest Item"_Counter
+	}
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	kill ^RES("UT","PI","UT")
+	do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestEnumeration">
 <Description>
 do ##class(vhUnitTest.Manager).RunTest("/display=all","Res.TestEnumeration")</Description>
@@ -117,25 +134,6 @@
 	do $$$AssertEquals($$LCVT^vhLib(Listbuild),$$LCVT^vhLib($listbuild("UnitTest Item1","UnitTest Item2","UnitTest Item3","UnitTest Item4","UnitTest Item5")))
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim Counter As %Integer = ""
-	for Counter = 1 : 1 : 5 { 
-		set ^RES("UT","PI","UT","D","UT"_Counter) = Counter_"`"_"UnitTest Item"_Counter
-	}
- 	quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	kill ^RES("UT","PI","UT")
-	quit $$$OK
-]]></Implementation>
-</Method>
 </Class>