Index: vhUnitTest/APPS/PM/Specials/TestSpecialsEditorService.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/APPS/PM/Specials/TestSpecialsEditorService.cls.xml	(.../TestSpecialsEditorService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/Specials/TestSpecialsEditorService.cls.xml	(.../TestSpecialsEditorService.cls.xml)	(revision 33029)
@@ -10,15 +10,10 @@
 <Default>UT aanpassing</Default>
 </Parameter>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1001,1001)
 	If (##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).%ExistsId(..#Naam)) Do ##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).DeleteId(..#Naam)
 	
 	Set ResultSet = ##class(%ResultSet).%New()
@@ -35,7 +30,7 @@
 <Method name="OnAfterAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1001,1001)
 	If (##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).%ExistsId(..#Naam)) Do ##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).DeleteId(..#Naam)
 	Quit $$$OK
 ]]></Implementation>
@@ -148,6 +143,7 @@
 
 <Method name="GeefBewerkingsInfoDiscreetFlowCalculator">
 <FormalSpec>MaatwerkType:APPS.PM.Maatwerk.dto.MaatwerkType</FormalSpec>
+<Private>1</Private>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsInfo</ReturnType>
 <Implementation><![CDATA[
 	Set Calculator = ##class(DOM.PM.Maatwerk.Calc.HF.impl.DiscreetFlowCalculator).%New(1000,0.12,30,0,0)
@@ -159,6 +155,7 @@
 
 <Method name="GeefBewerkingsInfoStandaardContinuFlowCalculator">
 <FormalSpec>MaatwerkType:APPS.PM.Maatwerk.dto.MaatwerkType</FormalSpec>
+<Private>1</Private>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsInfo</ReturnType>
 <Implementation><![CDATA[
 	Set Calculator = ##class(DOM.PM.Maatwerk.Calc.HF.impl.StandaardContinuFlowCalculator).%New(1000,0.12,30,0.36,40)
Index: vhUnitTest/DOM/PM/Maatwerk/HF/TestNietMeeleveren.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/DOM/PM/Maatwerk/HF/TestNietMeeleveren.cls.xml	(.../TestNietMeeleveren.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/HF/TestNietMeeleveren.cls.xml	(.../TestNietMeeleveren.cls.xml)	(revision 33029)
@@ -5,7 +5,24 @@
 do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.HF.TestNietMeeleveren") </Description>
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1001,1001)
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1001,1001)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefContext">
+<Private>1</Private>
 <ReturnType>vhTest.Fake.DOM.PM.Maatwerk.Calc.HF.HalffabContext</ReturnType>
 <Implementation><![CDATA[
 	Set Context = ##class(vhTest.Fake.DOM.PM.Maatwerk.Calc.HF.HalffabContext).%New("","","","")
@@ -14,11 +31,6 @@
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="TestVerwijderen">
 <Implementation><![CDATA[
 	Set IngegevenKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken).%New()
@@ -36,22 +48,6 @@
 	Do $$$AssertFalse($IsObject(HalffabItem),"Met maatwerkaanpassing is het weg")
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/PM/OL/MasterAutoGenerator.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/APPS/PM/OL/MasterAutoGenerator.cls.xml	(.../MasterAutoGenerator.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/OL/MasterAutoGenerator.cls.xml	(.../MasterAutoGenerator.cls.xml)	(revision 33029)
@@ -12,17 +12,12 @@
 <Private>1</Private>
 </Property>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
- 	set ..objTestData = ##class(vhUnitTest.DOM.PM.TestData).%New()
+ 	set ..objTestData = ##class(vhUnitTest.DOM.PM.TestData).%New(1001,1003)
 	
-	do ..objTestData.CreeerTestData()
+	do ..objTestData.CreeerTestData(1001,1003)
 	do $$$AssertEquals($data(^KPR(1001,0)),1,"Producten aangemaakt")
 	
 	quit $$$OK
Index: vhUnitTest/APPS/PM/ProductOpOrderLijnIt.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/APPS/PM/ProductOpOrderLijnIt.cls.xml	(.../ProductOpOrderLijnIt.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/ProductOpOrderLijnIt.cls.xml	(.../ProductOpOrderLijnIt.cls.xml)	(revision 33029)
@@ -10,23 +10,18 @@
 d ##class(vhUnitTest.Manager).RunTest(,"APPS.PM.ProductOpOrderLijnIt")</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	 do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()
+	 do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1000,1001)
 	 do ##class(OrderData).Delete()
 	 do ##class(OrderData).Create()
 	 quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="OnAfterAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	 do ##class(OrderData).Delete()
-	 do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
+	 do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1000,1001)
 	 quit $$$OK
 ]]></Implementation>
 </Method>
@@ -52,7 +47,6 @@
 
 <Method name="TestProduct1001">
 <Implementation><![CDATA[
-
 	set listInfo = ##class(%ListOfDataTypes).%New()
 
 	set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(1001)
@@ -65,7 +59,6 @@
 	do $$$AssertEquals(listInfo.Count(),1,"Aantal gevonden lijnen")
 	do $$$AssertEquals(listInfo.GetAt(1),"123346||102")
 
-
 	quit
 ]]></Implementation>
 </Method>
Index: vhUnitTest/DOM/PM/Maatwerk/HF/TestMaatwerkAanpassing.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/DOM/PM/Maatwerk/HF/TestMaatwerkAanpassing.cls.xml	(.../TestMaatwerkAanpassing.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/HF/TestMaatwerkAanpassing.cls.xml	(.../TestMaatwerkAanpassing.cls.xml)	(revision 33029)
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.DOM.PM.Maatwerk.HF.TestMaatwerkAanpassing">
-<Description>
-do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.HF.TestMaatwerkAanpassing") </Description>
 <Import>vhUnitTest.DOM.PM.Maatwerk.HF.impl,DOM.PM.Maatwerk.Calc.HF</Import>
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1001,1002)
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1001,1002)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefContext">
+<Private>1</Private>
 <ReturnType>vhTest.Fake.DOM.PM.Maatwerk.Calc.HF.HalffabContext</ReturnType>
 <Implementation><![CDATA[
 	Set Context = ##class(vhTest.Fake.DOM.PM.Maatwerk.Calc.HF.HalffabContext).%New("","","","")
@@ -15,12 +30,9 @@
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="TestToevoegenBestaandeRol">
+<Description>
+/Parameter Type As %String = "I";</Description>
 <Implementation><![CDATA[
 	Set MaatwerkAanpassing = ##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).%New()
 	Set HalffabrikaatAanpassing = ##class(DOM.PM.Maatwerk.Aanpassing.dto.HalffabrikaatAanpassing).%New()
@@ -149,22 +161,6 @@
 	Do $$$AssertEquals(HalffabItem.AfmetingMetBewerkingVerlies,112)
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/PM/OL/TestExcelImportChecker.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/APPS/PM/OL/TestExcelImportChecker.cls.xml	(.../TestExcelImportChecker.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/OL/TestExcelImportChecker.cls.xml	(.../TestExcelImportChecker.cls.xml)	(revision 33029)
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.PM.OL.TestExcelImportChecker">
-<Description>
-Oproepen via 
-	do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.PM.OL.TestExcelImportChecker") 
-</Description>
 <ClassType/>
-<IncludeCode>APPS.PM.OL.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	 Do ##super()
+	 	
+	 set TestData = ##class(vhUnitTest.DOM.PM.TestData).%New()
+	 do TestData.CreeerTestData(1001,1003)
+	 do TestData.CreeerTestData(1099,1099)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	 set TestData = ##class(vhUnitTest.DOM.PM.TestData).%New()
+	 do TestData.VerwijderTestData(1099,1099)
+	 do TestData.VerwijderTestData(1001,1003)
+	 Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestAddToLocalDataDef">
 <Description>
 Test dat de method AddToLocalDataDef() werkt</Description>
@@ -68,11 +82,6 @@
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="TestDeleteFromLocalDataDef">
 <Description>
 Test dat de method DeleteFromLocalDataDef() werkt</Description>
@@ -301,6 +310,7 @@
 </UDLText>
 
 <Method name="GeefImportChecker">
+<Private>1</Private>
 <ReturnType>APPS.PM.OL.ImportChecker</ReturnType>
 <Implementation><![CDATA[
 	Set KenmerkGroep="OL"
@@ -309,23 +319,6 @@
 	Quit ImportChecker
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	 Do ##super()
-	 	
-	 set TestData = ##class(vhUnitTest.DOM.PM.TestData).%New()
-	 do TestData.CreeerTestData()
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<Implementation><![CDATA[
-	 set TestData = ##class(vhUnitTest.DOM.PM.TestData).%New()
-	 do TestData.VerwijderTestData()
-	 Do ##super()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/PM/TestProductBeheerAPI.cls.xml
===================================================================
diff -u -r29059 -r33029
--- vhUnitTest/DOM/PM/TestProductBeheerAPI.cls.xml	(.../TestProductBeheerAPI.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/TestProductBeheerAPI.cls.xml	(.../TestProductBeheerAPI.cls.xml)	(revision 33029)
@@ -10,20 +10,19 @@
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()	
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1000,1000)	
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1031,1032)	
  	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="OnAfterAllTests">
+<Description>
+Parameter Type As %String = "I";</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1031,1032)
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1000,1000)
 	Quit $$$OK
 ]]></Implementation>
 </Method>