Index: vhUnitTest/APPS/VKP/TestOrderPrijsBepaler.cls.xml
===================================================================
diff -u -r29059 -r40153
--- vhUnitTest/APPS/VKP/TestOrderPrijsBepaler.cls.xml	(.../TestOrderPrijsBepaler.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VKP/TestOrderPrijsBepaler.cls.xml	(.../TestOrderPrijsBepaler.cls.xml)	(revision 40153)
@@ -13,6 +13,22 @@
 <Default>1000</Default>
 </Parameter>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+ 	do ##super()
+ 	set ..Onderneming = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
+ 	do ..MaakProduct()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Onderneming.GeefID())
+	do ..VerwijderProduct()
+	do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestStandaardOrder">
 <Implementation><![CDATA[
 	set OrderLevenCyclusService = ##class(APPS.VKP.OrderLevenCyclusService).%New()
@@ -230,24 +246,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
- 	set ..Onderneming = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
- 	do ..MaakProduct()
- 	quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Onderneming.GeefID())
-	do ..VerwijderProduct()
-	quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="MaakProduct">
 <Private>1</Private>
 <Implementation><![CDATA[