Index: vhUnitTest/DOM/VKP/TestKlant.cls.xml
===================================================================
diff -u -r29059 -r40298
--- vhUnitTest/DOM/VKP/TestKlant.cls.xml	(.../TestKlant.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/VKP/TestKlant.cls.xml	(.../TestKlant.cls.xml)	(revision 40298)
@@ -9,6 +9,21 @@
 <Type>DOM.VKP.VanHoeckeKlant</Type>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+ 	set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..Klant.GeefID()
+	do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(KlantID)
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestKlantOrderInstellingen">
 <Implementation><![CDATA[
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(##class(DOM.VKP.enu.Klant).TestklantVanHoecke())
@@ -210,23 +225,6 @@
 	do $$$AssertEquals(NativeKlant.GeefPrijsCodexTAOR(),"")
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
- 	set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..Klant.GeefID()
-	do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(KlantID)
-	quit $$$OK
-]]></Implementation>
-</Method>
 </Class>