Index: vhUnitTest/APPS/VisiDot/ZijkantControleurSoepel/TestVHossCases.cls.xml
===================================================================
diff -u -r29059 -r40138
--- vhUnitTest/APPS/VisiDot/ZijkantControleurSoepel/TestVHossCases.cls.xml	(.../TestVHossCases.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/ZijkantControleurSoepel/TestVHossCases.cls.xml	(.../TestVHossCases.cls.xml)	(revision 40138)
@@ -36,13 +36,20 @@
 <Type>%String</Type>
 </Property>
 
+<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">
 <Description>
 Opzetten van de VHossBuilder</Description>
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	
-	do ##super(aTestName)
+	Do ##super(aTestName)
 	Set ..WebService = ##class(vhUnitTest.WS.VisiDot.OperatorServer).%New()
 	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()
 	
@@ -94,13 +101,13 @@
 <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)
 	Kill ^KO2("F",..#KLNr,..#OrderID)
 	Kill ^KO1(..#OrderID,"F")
 	k ^UPRCP("B","VisiDot")
+	do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
@@ -318,14 +325,6 @@
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossReedsGedetecteerd(),"VHoss mag niet meer als binnenkomende VHoss aanschouwd worden.")
 ]]></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>