Index: vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml
===================================================================
diff -u -r29059 -r40182
--- vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 40182)
@@ -13,6 +13,25 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	
+	do ..VerwijderToelevering()
+	do ..MaakToelevering()
+	do ..VerwijderBatch()
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ..VerwijderToelevering()
+	do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestGeenBezwaar">
 <Implementation><![CDATA[
 	set BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
@@ -51,25 +70,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..VerwijderToelevering()
-	do ..MaakToelevering()
-	do ..VerwijderBatch()
-	
-	quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..VerwijderToelevering()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="MaakToelevering">
 <Private>1</Private>
 <Implementation><![CDATA[