Index: vhUnitTest/AXimpl/Admin/VKP/BevestigdKlantOrderIterator/Test.cls.xml
===================================================================
diff -u -r45494 -r45574
--- vhUnitTest/AXimpl/Admin/VKP/BevestigdKlantOrderIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 45494)
+++ vhUnitTest/AXimpl/Admin/VKP/BevestigdKlantOrderIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 45574)
@@ -18,11 +18,11 @@
 <Implementation><![CDATA[
 	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	
-	#dim Order As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
-	Do Order.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	#dim OrderStub As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderStub.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
 	
 	Set Orders = ##class(%ListOfObjects).%New()
-	Do Orders.Insert(Order)
+	Do Orders.Insert(OrderStub)
 	
 	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
 	
@@ -36,14 +36,14 @@
 <Implementation><![CDATA[
 	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	
-	#dim OrderA As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
-	Do OrderA.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
-	#dim OrderB As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
-	Do OrderB.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	#dim OrderStubA As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderStubA.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	#dim OrderStubB As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderStubB.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
 	
 	Set Orders = ##class(%ListOfObjects).%New()
-	Do Orders.Insert(OrderA)
-	Do Orders.Insert(OrderB)
+	Do Orders.Insert(OrderStubA)
+	Do Orders.Insert(OrderStubB)
 	
 	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
 	
@@ -59,14 +59,14 @@
 <Implementation><![CDATA[
 	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	
-	#dim OrderA As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
-	Do OrderA.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
-	#dim OrderB As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
-	Do OrderB.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$False)
+	#dim OrderStubA As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderStubA.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	#dim OrderStubB As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderStubB.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$False)
 	
 	Set Orders = ##class(%ListOfObjects).%New()
-	Do Orders.Insert(OrderA)
-	Do Orders.Insert(OrderB)
+	Do Orders.Insert(OrderStubA)
+	Do Orders.Insert(OrderStubB)
 	
 	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
 	
@@ -82,11 +82,11 @@
 <Implementation><![CDATA[
 	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	
-	#dim Order As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
-	Do Order.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$False)
+	#dim OrderStub As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderStub.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$False)
 	
 	Set Orders = ##class(%ListOfObjects).%New()
-	Do Orders.Insert(Order)
+	Do Orders.Insert(OrderStub)
 	
 	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))