Index: vhUnitTest/BL/ProdHist/TestChargeTrace.cls.xml
===================================================================
diff -u -r36603 -r36730
--- vhUnitTest/BL/ProdHist/TestChargeTrace.cls.xml	(.../TestChargeTrace.cls.xml)	(revision 36603)
+++ vhUnitTest/BL/ProdHist/TestChargeTrace.cls.xml	(.../TestChargeTrace.cls.xml)	(revision 36730)
@@ -27,7 +27,7 @@
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ##class(vhTest.Utils.DOM.PM.Product).Creeer(..#ProductId,..#ProductId)
+	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
 	Do ..MaakBon(..#BonID, ..Magazijn)
 	Do ##super(aTestName)
 ]]></Implementation>
@@ -37,7 +37,7 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ..VerwijderBon(..#BonID)	
-	Do ##class(vhTest.Utils.DOM.PM.Product).Verwijder(..#ProductId,..#ProductId)
+	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
Index: vhTest/Utils/DOM/PM/Product.cls.xml
===================================================================
diff -u -r36603 -r36730
--- vhTest/Utils/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 36603)
+++ vhTest/Utils/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 36730)
@@ -3,61 +3,85 @@
 <Class name="vhTest.Utils.DOM.PM.Product">
 <Super>TECH.RegisteredObject</Super>
 
-<Method name="Creeer">
+<Method name="CreeerProduct">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNrStart:%Integer=1000,PRNrStop:%Integer=1099</FormalSpec>
+<FormalSpec>PRNr...:%String</FormalSpec>
 <Implementation><![CDATA[
+	set Iterator = ##class(TECH.ArrayOneDimIterator).%New(.PRNr)
+	while Iterator.HasNext() {
+		do CreerProduct(Iterator.Next())
+	}
+	quit
+	
+CreerProduct(PRNr)
 	#define ProductPrijs 10	
-
 	do ##class(vhLib.OldSchool).InitVars()
-	
-	#dim PRNr,Nr,Node As %Integer
+
+	#dim Nr,Node As %Integer
 	#dim KortTekst As %String
-	
-	for PRNr = PRNrStart:1:PRNrStop {  
-		Set Nr = $translate($justify(PRNr - PRNrStart,2)," ",0)
-	    for Node=1:1:5 set ^KPR(PRNr,Node)="\"
-	   	#dim GenerischProduct As %String = ""
-	   	#dim LeverancierNr As %String = 5005
-	   	set KortTekst = "OL.UTPROD"_Nr_"\TEST PRODUCT "_Nr	
-		set ^KPR(PRNr,"I1")="01CH \01CH04ACC \01CH04ACC01MPL/BL \374"
+	Set Nr = $translate($justify(PRNr,2)," ",0)
+    for Node=1:1:5 set ^KPR(PRNr,Node)="\"
+   	#dim GenerischProduct As %String = ""
+   	#dim LeverancierNr As %String = 5005
+   	set KortTekst = "OL.UTPROD"_Nr_"\TEST PRODUCT "_Nr	
+	set ^KPR(PRNr,"I1")="01CH \01CH04ACC \01CH04ACC01MPL/BL \374"
 		
-		Set ^KPR(PRNr,0) = KortTekst
-		#dim IdentNr As %String = "0.123.45"_$extract(Nr,1)_"."_$extract(Nr,2)
-	    set $piece(^KPR(PRNr,2),"\",25)=IdentNr
-	    set $piece(^KPR(PRNr,0),"\",5)=8		   ; btw code
-	    set $piece(^KPR(PRNr,0),"\",14)=PRNr	   ; fysische stock
-	    set $piece(^KPR(PRNr,2),"\",14)="BAR"_PRNr ; barcode 
-		set ^KPR(PRNr,"I")=""
-		set ^KPR(PRNr,"J")=""		
-		set ^KPR(PRNr,"J"_LeverancierNr)=LeverancierNr ; _"\ \ \\\\\\22\\\\\\\1\EUR\\5\6.100000\\10\3.900000\61.000000\10\4.000000\40\"
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",3)= $replace(IdentNr,"0.123","L.123")
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",16)= 1 			      ; grootverpakking
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",17)= "EUR"			  ; muntcode
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",19)= $$$ProductPrijs
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",20)= 1
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",22)= $$$ProductPrijs
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",23)= $$$ProductPrijs-1
-		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",25)= $$$ProductPrijs
-	}
-	
+	Set ^KPR(PRNr,0) = KortTekst
+	#dim IdentNr As %String = "0.123.45"_$extract(Nr,1)_"."_$extract(Nr,2)
+    set $piece(^KPR(PRNr,2),"\",25)=IdentNr
+    set $piece(^KPR(PRNr,0),"\",5)=8		   ; btw code
+    set $piece(^KPR(PRNr,0),"\",14)=PRNr	   ; fysische stock
+    set $piece(^KPR(PRNr,2),"\",14)="BAR"_PRNr ; barcode 
+	set ^KPR(PRNr,"I")=""
+	set ^KPR(PRNr,"J")=""		
+	set ^KPR(PRNr,"J"_LeverancierNr)=LeverancierNr ; _"\ \ \\\\\\22\\\\\\\1\EUR\\5\6.100000\\10\3.900000\61.000000\10\4.000000\40\"
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",3)= $replace(IdentNr,"0.123","L.123")
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",16)= 1 			      ; grootverpakking
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",17)= "EUR"			  ; muntcode
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",19)= $$$ProductPrijs
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",20)= 1
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",22)= $$$ProductPrijs
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",23)= $$$ProductPrijs-1
+	set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",25)= $$$ProductPrijs
+
 	do BLDIND^PRODUKT2(PRNr) 
 	do Gemaakt^PRODUKT2(PRNr)
+	quit
 ]]></Implementation>
 </Method>
 
-<Method name="Verwijder">
+<Method name="CreeerProducten">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>PRNrStart:%Integer=1000,PRNrStop:%Integer=1099</FormalSpec>
 <Implementation><![CDATA[
+	#dim PRNr As %String 
+	for PRNr = PRNrStart:1:PRNrStop do ..CreeerProduct(PRNr)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderProduct">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNr...:%String</FormalSpec>
+<Implementation><![CDATA[
+	set Iterator = ##class(TECH.ArrayOneDimIterator).%New(.PRNr)
+	while Iterator.HasNext() {
+		do VerwijderProduct(Iterator.Next())
+	}
+	quit
+
+VerwijderProduct(PRNr)
 	do ##class(vhLib.OldSchool).InitVars()
-	
 	#dim ProductAPI As DOM.PM.ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
-	
+	if ProductAPI.BestaatProduct(PRNr) do DELETE^PRODUKT2(PRNr,1)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderProducten">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNrStart:%Integer=1000,PRNrStop:%Integer=1099</FormalSpec>
+<Implementation><![CDATA[
 	#dim PRNr As %Integer
-	for PRNr = PRNrStart:1:PRNrStop {  
-		if ProductAPI.BestaatProduct(PRNr) do DELETE^PRODUKT2(PRNr,1)
-	}
+	for PRNr = PRNrStart:1:PRNrStop do ..VerwijderProduct(PRNr)
 ]]></Implementation>
 </Method>
 </Class>