Index: vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml
===================================================================
diff -u -r33028 -r40132
--- vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml	(.../TestEntiteitComponentDataService.cls.xml)	(revision 33028)
+++ vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml	(.../TestEntiteitComponentDataService.cls.xml)	(revision 40132)
@@ -15,8 +15,9 @@
 <Method name="OnBeforeAllTests">
 <Description>
 Parameter Type As %String = "I";</Description>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+ 	Do ##super()
+ 	
  	set ..objTestData = ##class(vhUnitTest.DOM.PM.TestData).%New()	
 	do ..objTestData.CreeerTestData(1000,1030)
 	
@@ -41,13 +42,10 @@
 	Set ^KTO(6332,296195,102)="\629192\30\\\47.68\#\\47.68\47.68\\L\1\\200\47.68\KTRPL\\\\E\EUR\\\11/06\\118153\102\\\\\\\\"
 	
 	Do ##class(DOM.AKP.event.ToeleveringEventRaiser).RaiseToeleveringGemaaktEvent(296195)
-		
-	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do:$Data(^KOD(6279,"F",118153)) ##class(DOM.VKP.event.OrderEventRaiser).RaiseOrderVerwijderdEvent(118153)
 	Kill ^KOD(6279,"F",118153)
@@ -58,7 +56,8 @@
 	Kill ^KTO(6332,296195)
 	
 	do ..objTestData.VerwijderTestData(1000,1030)
- 	Quit $$$OK
+	
+	Do ##super()
 ]]></Implementation>
 </Method>