Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u -r29059 -r40139
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 40139)
@@ -31,10 +31,19 @@
 <Default>99999</Default>
 </Parameter>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Do:$Data(^KOD(..#KLNr,"F",..#OrderID)) ##class(DOM.VKP.event.OrderEventRaiser).RaiseOrderVerwijderdEvent(..#OrderID)
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
+	
 	Set ..WebService = ##class(vhUnitTest.WS.VisiDot.OperatorServer).%New()
 	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()	
 	Set SlotLabel=0
@@ -67,16 +76,12 @@
 	Do QueueBuilder.BuildBatch()
 	
 	Set ..DirUnitTestFiles = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GetString("UnitTestRoot"),"APPS.VisiDot")
-
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	do ##super(aTestName)
-	
 	Do ##class(vhUnitTest.APPS.common.Toelevering).VerwijderToelevering(..ToeleveringID)
 	Do:$Data(^KOD(..#KLNr,"F",..#OrderID)) ##class(DOM.VKP.event.OrderEventRaiser).RaiseOrderVerwijderdEvent(..#OrderID)
 	Kill ^KOD(..#KLNr,"F",..#OrderID)
@@ -86,14 +91,17 @@
 	Set VHossService = ##class(APPS.VisiDot.impl.VHossService).%New()
 	Do VHossService.RecepteerVHoss("O110000077")
 	Do VHossService.RecepteerVHoss("O110000099")
+	
+	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	do ##super()
 	k ^APPS.VisiDot.RecepteerBatch(..#BatchID)
 	k ^UPRCP("B","VisiDot")
+	
+	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -260,14 +268,6 @@
 	Do $$$AssertTrue(IsOk,"End Order was correct.")
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do:$Data(^KOD(..#KLNr,"F",..#OrderID)) ##class(DOM.VKP.event.OrderEventRaiser).RaiseOrderVerwijderdEvent(..#OrderID)
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>