Index: vhUnitTest/APPS/CRM/TestKlantService.cls.xml
===================================================================
diff -u -r29059 -r40210
--- vhUnitTest/APPS/CRM/TestKlantService.cls.xml	(.../TestKlantService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/CRM/TestKlantService.cls.xml	(.../TestKlantService.cls.xml)	(revision 40210)
@@ -13,8 +13,9 @@
 </Property>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
+	
 	Set KlantObject = ##class(DOM.common.dto.Partij).%New()
 	Set KlantObject.KlantNaam = "Unit2Test Klant"
 	Set KlantObject.Toenaam = "Jos"
@@ -26,8 +27,14 @@
 	Set KlantObject.BTWNummer = "123456"
 	
 	Set ..KlantID = ##class(APPS.KlantBeheer.KlantLevenCyclusService).%New().MaakKlant(KlantObject,##class(DOM.CRM.enu.TypeTemplateKlant).Consument())
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..KlantID)
 	
-	Quit $$$OK
+	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -49,11 +56,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
-<Implementation><![CDATA[	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..KlantID)
-]]></Implementation>
-</Method>
-
 <Method name="GeefAdres">
 <Private>1</Private>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>