Index: vhUnitTest/APPS/common/TestDataService.cls.xml
===================================================================
diff -u -r29059 -r33028
--- vhUnitTest/APPS/common/TestDataService.cls.xml	(.../TestDataService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/common/TestDataService.cls.xml	(.../TestDataService.cls.xml)	(revision 33028)
@@ -18,11 +18,6 @@
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>IntegratieTest</Default>
-</Parameter>
-
 <Method name="TestKlantData">
 <Implementation><![CDATA[
 	Set Service = ##class(APPS.common.impl.DataService).%New()
@@ -60,7 +55,7 @@
 <Method name="TestProductData">
 <Implementation><![CDATA[
 	Set TestData = ##class(vhUnitTest.DOM.PM.TestData).%New()
-	Do TestData.CreeerTestData()
+	Do TestData.CreeerTestData(1000,1000)
 	
 	Set Service = ##class(APPS.common.impl.DataService).%New() 
 	Set ProductData = Service.GeefProductData(1000)
@@ -72,7 +67,7 @@
 	Do $$$AssertEquals(ProductData.ClassificatieID,"374","De classificatie id")
 	Do $$$AssertTrue($IsObject(ProductData.Classificatie),"De classificatie is ingesteld")
 	
-	Do TestData.VerwijderTestData()
+	Do TestData.VerwijderTestData(1000,1000)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml
===================================================================
diff -u -r29059 -r33028
--- vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml	(.../TestEntiteitComponentDataService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml	(.../TestEntiteitComponentDataService.cls.xml)	(revision 33028)
@@ -12,16 +12,13 @@
 <Private>1</Private>
 </Property>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="OnBeforeAllTests">
+<Description>
+Parameter Type As %String = "I";</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
  	set ..objTestData = ##class(vhUnitTest.DOM.PM.TestData).%New()	
-	do ..objTestData.CreeerTestData()
+	do ..objTestData.CreeerTestData(1000,1030)
 	
 	Set ^KOD(6279,"F",118153,0)=103
 	Set ^KOD(6279,"F",118153,1)="\02.02.11\45263 cuisine cote basque\\\6279\DI2;1`DI2;2`DI2;3`DI2;4`DI2;5\1087#1096#62124,64781\\ygransart@lmc.tm.fr\\\\1\\\\EUR\\\00\2\\1087#62124,64781#118153\\\\\\\\\\\\\\\\\\\\\62124,64781"
@@ -60,7 +57,7 @@
 	Kill ^KTO1(296195)
 	Kill ^KTO(6332,296195)
 	
-	do ..objTestData.VerwijderTestData()
+	do ..objTestData.VerwijderTestData(1000,1030)
  	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/common/StockOverKinderen.cls.xml
===================================================================
diff -u -r29059 -r33028
--- vhUnitTest/APPS/common/StockOverKinderen.cls.xml	(.../StockOverKinderen.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/common/StockOverKinderen.cls.xml	(.../StockOverKinderen.cls.xml)	(revision 33028)
@@ -12,15 +12,10 @@
 <Implementation><![CDATA[
 	 do ##super()
 	 do ..CreatePRBS()	
-	 do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()
+	 do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1000,1015)
 ]]></Implementation>
 </Method>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Method name="CreatePRBS">
 <Implementation><![CDATA[
   	do ..DeletePRBS()
@@ -81,7 +76,7 @@
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
  	do ..DeletePRBS()
- 	do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
+ 	do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1000,1015)
 	Do ##super()
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/common/KlantKost/TestOrderIngaveLoonKost.cls.xml
===================================================================
diff -u -r29059 -r33028
--- vhUnitTest/APPS/common/KlantKost/TestOrderIngaveLoonKost.cls.xml	(.../TestOrderIngaveLoonKost.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/common/KlantKost/TestOrderIngaveLoonKost.cls.xml	(.../TestOrderIngaveLoonKost.cls.xml)	(revision 33028)
@@ -19,7 +19,7 @@
 <Implementation><![CDATA[
 	#dim Status As %Status = $$$OK
 	
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData()
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1001,1019)
 	
 	Set ^KFA("F",2,0,0)	= 	"15390\F\21.10.01\1\EUR\21.10.01\35.61\35.61\7.48\0.00\0.00\43.09\0\43.09\\1\8#0.00\\\\\\\\\\"
 	Set ^KFA("F",2,"U342756",1)	= 	"\21.10.01\\\\15390\TNC #TNT via DI3 Zaltbommel\\#\gamwelman@kpnmail.nl\\\0.00##1.29228\1\\18.05.11\\EUR\005004\\30\1\N\###\\\\F\\\\\\\\\\\\\\\43197\\58725,31224\\\1112\58725,31224"
@@ -74,7 +74,7 @@
 	#dim RS As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB())
 	Do RS.Next()
 	
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData()
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1001,1019)
 	
 	Quit Status
 ]]></Implementation>