Index: vhUnitTest/DOM/VKP/impl/Regio.cls.xml
===================================================================
diff -u -r29059 -r40239
--- vhUnitTest/DOM/VKP/impl/Regio.cls.xml	(.../Regio.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/VKP/impl/Regio.cls.xml	(.../Regio.cls.xml)	(revision 40239)
@@ -3,11 +3,25 @@
 <Class name="vhUnitTest.DOM.VKP.impl.Regio">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	do ..VerwijderTestRegio()
+	do ..MaakTestRegio()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ..VerwijderTestRegio()
+	do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="Test">
-<Description>
-do ##class(vhUnitTest.Manager).RunTest("/display=all","DOM.VKP.impl.Regio")</Description>
 <Implementation><![CDATA[
-	set Regio = ##class(DOM.VKP.impl.Regio).Open(9999)
+	#dim Regio As DOM.VKP.impl.Regio = ##class(DOM.VKP.impl.Regio).Open(9999)
 	
 	do $$$AssertEquals(Regio.GeefDivisie(),##class(DOM.VKP.enu.Divisie).Consument())
 	do $$$AssertEquals(Regio.GeefOmschrijving(),"UNITTEST REGIO")
@@ -31,32 +45,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..VerwijderTestRegio()
-	do ..MaakTestRegio()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..VerwijderTestRegio()
-	quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="VerwijderTestRegio">
+<Private>1</Private>
 <Implementation><![CDATA[	Kill ^RES("KLANT","PI","REGIO","D",9999)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakTestRegio">
-<Implementation><![CDATA[
-	Set ^RES("KLANT","PI","REGIO","D",9999)="9999`UNITTEST REGIO`40`40`4682||1000`CONS`````````4682||1000````4682||30`Consument`1019"
-	Quit
+<Private>1</Private>
+<Implementation><![CDATA[	Set ^RES("KLANT","PI","REGIO","D",9999)="9999`UNITTEST REGIO`40`40`4682||1000`CONS`````````4682||1000````4682||30`Consument`1019"
 ]]></Implementation>
 </Method>
 </Class>