Index: vhUnitTest/APPS/common/ProductCriteria/ProductCriterium/Base.cls.xml
===================================================================
diff -u -r29059 -r40252
--- vhUnitTest/APPS/common/ProductCriteria/ProductCriterium/Base.cls.xml	(.../Base.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/common/ProductCriteria/ProductCriterium/Base.cls.xml	(.../Base.cls.xml)	(revision 40252)
@@ -9,20 +9,18 @@
 </Parameter>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
  	Do ##class(vhUnitTest.APPS.common.ProductCriteria.Producten).Genereer()
 	set ^KLAS("K",1)= "3\16\1\1\XX\XXX\XXX/XX\1251\1252\Generisch prod Dynaplug\.52\0\1009\\\\\\\\0"
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ##class(vhUnitTest.APPS.common.ProductCriteria.Producten).Verwijder()
 	Kill ^KLAS("K",1)
-	Quit $$$OK
+	Do ##super()
 ]]></Implementation>
 </Method>
 </Class>