Index: vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml
===================================================================
diff -u -r38632 -r40304
--- vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml	(.../TestTBXLade.cls.xml)	(revision 38632)
+++ vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml	(.../TestTBXLade.cls.xml)	(revision 40304)
@@ -10,6 +10,30 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)	
+	Set ..ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.PM.Maatwerk.TestData).VerwijderData()
+	
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(511642,$LB("TBX"))
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(477522,$LB("TBX"))
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(517002,$LB("TBX"))
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(463746,$LB("TBX"))
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(470275,$LB("TBX"))
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(463749,$LB("TBX"))
+	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(463748,$LB("TBX"))
+
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestProductImpl">
 <Implementation><![CDATA[
 	#Dim Product As DOM.PM.Product = ..ProductAPI.GeefProduct(595226)
@@ -468,32 +492,6 @@
 	Quit $$$OK
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	
-	Set ..ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.Maatwerk.TestData).VerwijderData()
-	
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(511642,$LB("TBX"))
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(477522,$LB("TBX"))
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(517002,$LB("TBX"))
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(463746,$LB("TBX"))
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(470275,$LB("TBX"))
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(463749,$LB("TBX"))
-	Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr(463748,$LB("TBX"))
-
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>