Index: vhUnitTest/APPS/VisiDot/TestProductInTweeVhossenVoorTweeToeleveringen.cls.xml
===================================================================
diff -u -r29059 -r57607
--- vhUnitTest/APPS/VisiDot/TestProductInTweeVhossenVoorTweeToeleveringen.cls.xml	(.../TestProductInTweeVhossenVoorTweeToeleveringen.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/TestProductInTweeVhossenVoorTweeToeleveringen.cls.xml	(.../TestProductInTweeVhossenVoorTweeToeleveringen.cls.xml)	(revision 57607)
@@ -30,18 +30,12 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductID2">
-<Type>%String</Type>
+<Method name="ZetProductIds">
 <Private>1</Private>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set VisiDotHelper = ##class(vhUnitTest.APPS.VisiDot.Helper).%New()		
 	Set ..ProductIDs = VisiDotHelper.GeefWillekeurigTBXProducten(10)	
-	Do ##super(aTestName)
+	Do ##class(TECH.ListUtils).AppendList(..GebruikteProductIDs, ..ProductIDs)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VisiDot/TestProductInTweeVhossenVoorEenToeleveringen.cls.xml
===================================================================
diff -u -r29059 -r57607
--- vhUnitTest/APPS/VisiDot/TestProductInTweeVhossenVoorEenToeleveringen.cls.xml	(.../TestProductInTweeVhossenVoorEenToeleveringen.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/TestProductInTweeVhossenVoorEenToeleveringen.cls.xml	(.../TestProductInTweeVhossenVoorEenToeleveringen.cls.xml)	(revision 57607)
@@ -25,18 +25,12 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductID2">
-<Type>%String</Type>
+<Method name="ZetProductIds">
 <Private>1</Private>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set VisiDotHelper = ##class(vhUnitTest.APPS.VisiDot.Helper).%New()		
 	Set ..ProductIDs = VisiDotHelper.GeefWillekeurigTBXProducten(10)	
-	Do ##super(aTestName)
+	Do ##class(TECH.ListUtils).AppendList(..GebruikteProductIDs, ..ProductIDs)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VisiDot/TestProductInBase.cls.xml
===================================================================
diff -u -r29059 -r57607
--- vhUnitTest/APPS/VisiDot/TestProductInBase.cls.xml	(.../TestProductInBase.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/TestProductInBase.cls.xml	(.../TestProductInBase.cls.xml)	(revision 57607)
@@ -232,6 +232,10 @@
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Do ..ZetProductIds()
+
 	Set ..WebService = ##class(vhUnitTest.WS.VisiDot.OperatorServer).%New()
 	do ..CleanUp()
 	Set OrderIDIt = ##class(TECH.ListIterator).%New(..GeefOrderIDs())
@@ -244,8 +248,6 @@
 	do ..MaakBatchQueue()
 	do ..RegistreerVHoss()
 	do ..VerwijderVHossRegistratieOpEMWS()
-	
-	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
@@ -257,6 +259,10 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetProductIds">
+<Private>1</Private>
+</Method>
+
 <Method name="GeefOrderIDs">
 <Abstract>1</Abstract>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: vhUnitTest/APPS/VisiDot/TestProductInEenVhossVoorTweeToeleveringen.cls.xml
===================================================================
diff -u -r29059 -r57607
--- vhUnitTest/APPS/VisiDot/TestProductInEenVhossVoorTweeToeleveringen.cls.xml	(.../TestProductInEenVhossVoorTweeToeleveringen.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/TestProductInEenVhossVoorTweeToeleveringen.cls.xml	(.../TestProductInEenVhossVoorTweeToeleveringen.cls.xml)	(revision 57607)
@@ -23,14 +23,14 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<Method name="ZetProductIds">
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set VisiDotHelper = ##class(vhUnitTest.APPS.VisiDot.Helper).%New()		
 	Set ..ProductID1 = VisiDotHelper.GeefWillekeurigTBXProductID1()
 	Set ..ProductID2 = VisiDotHelper.GeefWillekeurigTBXProductID2()	
-	Do ##super(aTestName)
+	Do ..GebruikteProductIDs.Insert(..ProductID1)
+	Do ..GebruikteProductIDs.Insert(..ProductID2)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VisiDot/TestProductInEenVhossVoorTweeToelevMeerdereLijnen.cls.xml
===================================================================
diff -u -r29059 -r57607
--- vhUnitTest/APPS/VisiDot/TestProductInEenVhossVoorTweeToelevMeerdereLijnen.cls.xml	(.../TestProductInEenVhossVoorTweeToelevMeerdereLijnen.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VisiDot/TestProductInEenVhossVoorTweeToelevMeerdereLijnen.cls.xml	(.../TestProductInEenVhossVoorTweeToelevMeerdereLijnen.cls.xml)	(revision 57607)
@@ -25,14 +25,14 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<Method name="ZetProductIds">
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set VisiDotHelper = ##class(vhUnitTest.APPS.VisiDot.Helper).%New()		
 	Set ..ProductID1 = VisiDotHelper.GeefWillekeurigTBXProductID1()
 	Set ..ProductID2 = VisiDotHelper.GeefWillekeurigTBXProductID2()	
-	Do ##super(aTestName)
+	Do ..GebruikteProductIDs.Insert(..ProductID1)
+	Do ..GebruikteProductIDs.Insert(..ProductID2)
 ]]></Implementation>
 </Method>