Index: vhUnitTest/BL/Flow/Proxy/pxFactuur/TestB2C.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxFactuur/TestB2C.cls.xml	(.../TestB2C.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxFactuur/TestB2C.cls.xml	(.../TestB2C.cls.xml)	(revision 40272)
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.BL.Flow.Proxy.pxFactuur.TestB2C">
-<Description>
-d ##class(vhUnitTest.Manager).RunTest("/display=all","BL.Flow.Proxy.pxFactuur.TestB2B")</Description>
 <Super>vhUnitTest.BL.Flow.Proxy.TestCase</Super>
 
 <Property name="Data">
@@ -14,6 +12,14 @@
 <Default>1.21</Default>
 </Parameter>
 
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="TestConsumentVrijgsteldBTW">
 <Implementation><![CDATA[
 	do ..Data.MaakBuitenlandseConsumentVrijgesteldVanBTW()
@@ -189,14 +195,6 @@
 	do ..Data.VerwijderProduct()
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Flow/Proxy/pxFactuur/TestIsLidBTWEenheidVanHoecke.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxFactuur/TestIsLidBTWEenheidVanHoecke.cls.xml	(.../TestIsLidBTWEenheidVanHoecke.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxFactuur/TestIsLidBTWEenheidVanHoecke.cls.xml	(.../TestIsLidBTWEenheidVanHoecke.cls.xml)	(revision 40272)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.BL.Flow.Proxy.pxFactuur.TestIsLidBTWEenheidVanHoecke">
-<Description>
-d ##class(vhUnitTest.Manager).RunTest("/display=all","BL.Flow.Proxy.pxFactuur.TestProformaB2B")</Description>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.BL.Flow.Proxy.TestCase</Super>
 
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-</Property>
-
 <Method name="TestOndernemingNettoPrijzen">
 <Implementation><![CDATA[
 	#dim FactuurTotaal As %Decimal = 180.58
@@ -41,17 +35,8 @@
 	do ..Data.VerwijderFactuur()
 	do ..Data.VerwijderOnderneming()
 	do ..Data.VerwijderProduct()
-	quit
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Flow/Proxy/pxFactuur/TestProformaB2C.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxFactuur/TestProformaB2C.cls.xml	(.../TestProformaB2C.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxFactuur/TestProformaB2C.cls.xml	(.../TestProformaB2C.cls.xml)	(revision 40272)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.BL.Flow.Proxy.pxFactuur.TestProformaB2C">
-<Description>
-d ##class(vhUnitTest.Manager).RunTest("/display=all","BL.Flow.Proxy.pxFactuur.TestProformaB2C")</Description>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.BL.Flow.Proxy.TestCase</Super>
 
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-</Property>
-
 <Parameter name="BTWPercentage">
 <Type>%Decimal</Type>
 <Default>1.21</Default>
@@ -102,14 +96,6 @@
 	do ..Data.VerwijderProduct()
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Flow/Proxy/pxOrder/TestB2C/Abstract.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxOrder/TestB2C/Abstract.cls.xml	(.../Abstract.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxOrder/TestB2C/Abstract.cls.xml	(.../Abstract.cls.xml)	(revision 40272)
@@ -8,11 +8,6 @@
 <Default>1</Default>
 </Parameter>
 
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="pxOrder">
 <Type>BL.Flow.Proxy.pxOrder</Type>
 <Private>1</Private>
@@ -96,14 +91,6 @@
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Flow/Proxy/pxFactuur/TestB2B.cls.xml
===================================================================
diff -u -r40269 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxFactuur/TestB2B.cls.xml	(.../TestB2B.cls.xml)	(revision 40269)
+++ vhUnitTest/BL/Flow/Proxy/pxFactuur/TestB2B.cls.xml	(.../TestB2B.cls.xml)	(revision 40272)
@@ -3,22 +3,6 @@
 <Class name="vhUnitTest.BL.Flow.Proxy.pxFactuur.TestB2B">
 <Super>vhUnitTest.BL.Flow.Proxy.TestCase</Super>
 
-<Parameter name="GebruiktVariabeleControle">
-<Default>0</Default>
-</Parameter>
-
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	do ##super()
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
-]]></Implementation>
-</Method>
-
 <Method name="TestOndernemingNettoPrijzen">
 <Implementation><![CDATA[
 	#dim FactuurTotaal As %Decimal = 180.58
Index: vhUnitTest/BL/Flow/Proxy/pxOrder/TestB2B/Abstract.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxOrder/TestB2B/Abstract.cls.xml	(.../Abstract.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxOrder/TestB2B/Abstract.cls.xml	(.../Abstract.cls.xml)	(revision 40272)
@@ -8,11 +8,6 @@
 <Default>1</Default>
 </Parameter>
 
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="pxOrder">
 <Type>BL.Flow.Proxy.pxOrder</Type>
 <Private>1</Private>
@@ -95,14 +90,6 @@
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Flow/Proxy/TestCase.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 40272)
@@ -4,6 +4,22 @@
 <Abstract>1</Abstract>
 <Super>vhUnitTest.TestCase,TECH.Template</Super>
 
+<Parameter name="GebruiktVariabeleControle">
+<Default>0</Default>
+</Parameter>
+
+<Property name="Data">
+<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
+]]></Implementation>
+</Method>
+
 <Method name="AssertMemo">
 <FormalSpec>MemoType:%String="",Memos:%ListOfObjects(ELEMENTTYPE="BL.FOP.Basis.pxTekstHTML"),Tekst:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/BL/Flow/Proxy/pxOfferte/TestB2C.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxOfferte/TestB2C.cls.xml	(.../TestB2C.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxOfferte/TestB2C.cls.xml	(.../TestB2C.cls.xml)	(revision 40272)
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.BL.Flow.Proxy.pxOfferte.TestB2C">
-<Description>
-d ##class(vhUnitTest.Manager).RunTest("/display=all","BL.Flow.Proxy.pxOfferte.TestB2C")</Description>
 <Super>vhUnitTest.BL.Flow.Proxy.TestCase</Super>
 
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="TestConsumentNettoPrijzen">
 <Implementation><![CDATA[
 	do ..Data.MaakConsument()
@@ -109,14 +102,6 @@
 <Implementation><![CDATA[	do ..AssertMemo("PRIJS_GELDIG_BTWCLAUSULE",pxOfferte.MEMO,"Geldig 30 dagen. Alle vermelde eenheidsprijzen zijn inclusief BTW")
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Flow/Proxy/pxOfferte/TestFlowB2C.cls.xml
===================================================================
diff -u -r29059 -r40272
--- vhUnitTest/BL/Flow/Proxy/pxOfferte/TestFlowB2C.cls.xml	(.../TestFlowB2C.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Flow/Proxy/pxOfferte/TestFlowB2C.cls.xml	(.../TestFlowB2C.cls.xml)	(revision 40272)
@@ -3,15 +3,6 @@
 <Class name="vhUnitTest.BL.Flow.Proxy.pxOfferte.TestFlowB2C">
 <Super>vhUnitTest.BL.Flow.Proxy.TestCase</Super>
 
-<Property name="Data">
-<Type>vhUnitTest.BL.Flow.Proxy.TestData</Type>
-<Private>1</Private>
-</Property>
-
-<Parameter name="GebruiktVariabeleControle">
-<Default>0</Default>
-</Parameter>
-
 <Property name="Offerte">
 <Type>Flow.Offerte.Hoofding</Type>
 <Private>1</Private>
@@ -167,20 +158,19 @@
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	do ##super()
 	set blFlowOfferte = ##class(BL.Flow.Offerte.Build).%New()
 	Set %tmpOffBL = blFlowOfferte
 	Set %blFlowOfferte = blFlowOfferte
-	Set ..Data = ##class(vhUnitTest.BL.Flow.Proxy.TestData).%New()
- 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	do ##super()
 	Kill %tmpOffBL
 	Kill %blFlowOfferte
+	do ##super()
 ]]></Implementation>
 </Method>
 </Class>