Index: vhUnitTest/APPS/VKP/Commissie/impl/CommissieMailNaarAanbrenger/Algemeen/Test.cls.xml
===================================================================
diff -u -r29059 -r40156
--- vhUnitTest/APPS/VKP/Commissie/impl/CommissieMailNaarAanbrenger/Algemeen/Test.cls.xml	(.../Test.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VKP/Commissie/impl/CommissieMailNaarAanbrenger/Algemeen/Test.cls.xml	(.../Test.cls.xml)	(revision 40156)
@@ -28,6 +28,39 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeConsument()
+	Set ..Aanbrenger = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ..VerwijderCommissieData()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..VerwijderCommissieData()
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ..SchakelInAlleEvents()
+	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Klant.GeefID())
+	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Aanbrenger.GeefID())
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestIsAanbrengerMetCommissieVerantwoordelijkenMetEmail">
 <Description>
 do ##class(vhUnitTest.Manager).RunTest("/display=all/debug","APPS.VKP.impl.TestCommissieMailNaarAanbrenger")</Description>
@@ -67,24 +100,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeConsument()
-	set ..Aanbrenger = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
-	quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##super(aTestName)
-	do ..VerwijderCommissieData()
-]]></Implementation>
-</Method>
-
 <Method name="VerwijderCommissieData">
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -93,25 +108,6 @@
 	do ExecDynQuery^vhLib.Query("DELETE FROM DOM_VKP_impl.Commissie WHERE Verkoopfactuur = ?",$listbuild(..#Factuur3))
 ]]></Implementation>
 </Method>
-
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##super(aTestName)
-	do ..VerwijderCommissieData()
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ..SchakelInAlleEvents()
-	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Klant.GeefID())
-	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Aanbrenger.GeefID())
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>