Index: vhUnitTest/APPS/PM/OL/MasterAutoGenerator.cls.xml
===================================================================
diff -u -r33029 -r40168
--- vhUnitTest/APPS/PM/OL/MasterAutoGenerator.cls.xml	(.../MasterAutoGenerator.cls.xml)	(revision 33029)
+++ vhUnitTest/APPS/PM/OL/MasterAutoGenerator.cls.xml	(.../MasterAutoGenerator.cls.xml)	(revision 40168)
@@ -13,27 +13,24 @@
 </Property>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	do ##super()
  	set ..objTestData = ##class(vhUnitTest.DOM.PM.TestData).%New(1001,1003)
 	
 	do ..objTestData.CreeerTestData(1001,1003)
 	do $$$AssertEquals($data(^KPR(1001,0)),1,"Producten aangemaakt")
-	
-	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	do ..objTestData.VerwijderTestData()
 	do $$$AssertEquals($data(^KPR(1001,0)),0,"Producten verwijderd")
 	
 	set blnMetaDefOpgekuisd = ..objTestData.IsMetaDefMooiOpgekuisd()
 	do $$$AssertEquals(blnMetaDefOpgekuisd,1,"Sorteringswaarde opgekuisd in metadefs")
 
-	Quit $$$OK
+	do ##super()
 ]]></Implementation>
 </Method>