Index: vhUnitTest/BL/Legacy/TestEWPAL.cls.xml
===================================================================
diff -u -r29059 -r40257
--- vhUnitTest/BL/Legacy/TestEWPAL.cls.xml	(.../TestEWPAL.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Legacy/TestEWPAL.cls.xml	(.../TestEWPAL.cls.xml)	(revision 40257)
@@ -6,8 +6,8 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Do ..OnAfterAllTests()
 	
 	Set ^KO1(100000,"F") = "1000"
@@ -28,8 +28,18 @@
 	Set ^EWPAL("D",1002,"00112235",100000) = ""
 	
 	Set ^EWPAL("D",1003,"00112235",100001) = ""
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do:$Data(^KOD(1000,"F",100000)) ##class(DOM.VKP.event.OrderEventRaiser).RaiseOrderVerwijderdEvent(100000)
+	Kill ^KO1(100000)
+	Kill ^KOD(1000,"F",100000)
+	Kill ^EWPAL("D",1001)
+	Kill ^EWPAL("D",1002)
 	
- 	Quit $$$OK
+	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -44,19 +54,6 @@
 	Do $$$AssertFalse(Iterator.HasNext())
 ]]></Implementation>
 </Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do:$Data(^KOD(1000,"F",100000)) ##class(DOM.VKP.event.OrderEventRaiser).RaiseOrderVerwijderdEvent(100000)
-	Kill ^KO1(100000)
-	Kill ^KOD(1000,"F",100000)
-	Kill ^EWPAL("D",1001)
-	Kill ^EWPAL("D",1002)
-	
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>