Index: AXimpl/Controle/Order/Admin/AdminOrderLijnIterator.cls.xml
===================================================================
diff -u -r44045 -r44046
--- AXimpl/Controle/Order/Admin/AdminOrderLijnIterator.cls.xml	(.../AdminOrderLijnIterator.cls.xml)	(revision 44045)
+++ AXimpl/Controle/Order/Admin/AdminOrderLijnIterator.cls.xml	(.../AdminOrderLijnIterator.cls.xml)	(revision 44046)
@@ -14,14 +14,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OrderApi:DOM.VKP.OrderAPI="",Converter:AXimpl.Controle.Order.Admin.AdminOrderLijnConverter</FormalSpec>
+<FormalSpec>OrderIterator:TECH.Iterator="",Converter:AXimpl.Controle.Order.Admin.AdminOrderLijnConverter</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
-	#dim OrderIterator As TECH.Iterator = ##class(AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New(OrderApi)
+	Set OrderIterator = $$$Inject(OrderIterator,##class(AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New())
 	Set ..CombinedIterator = ##class(TECH.CombinedIterator).%New(OrderIterator,##class(AXimpl.Controle.Order.Admin.OrderLijnIterator).%ClassName($$$True))
 	Set ..Converter = $$$Inject(Converter,##class(AXimpl.Controle.Order.Admin.AdminOrderLijnConverter).%New())
 	Quit $$$OK
Index: vhTest/Fake/AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(revision 44046)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.Admin.VKP.BevestigdKlantOrderIterator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.Admin.VKP.BevestigdKlantOrderIterator</Super>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>DOM.VKP.Order</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml
===================================================================
diff -u -r44045 -r44046
--- AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(.../BevestigdKlantOrderIterator.cls.xml)	(revision 44045)
+++ AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(.../BevestigdKlantOrderIterator.cls.xml)	(revision 44046)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Admin.VKP.BevestigdKlantOrderIterator">
-<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+<Super>TECH.RegisteredObject,TECH.Iterator,TECH.Mockable</Super>
 
 <Property name="DynamicIterator">
 <Type>TECH.DynamicIterator</Type>
Index: vhTest/Mock/AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(revision 44046)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.Admin.VKP.BevestigdKlantOrderIterator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.Admin.VKP.BevestigdKlantOrderIterator,vhTest.Mock.TECH.Iterator</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("HasNext")
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Key")
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>DOM.VKP.Order</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Next")
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Reset")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Controle/Order/Admin/AdminOrderLijnIterator/Test.cls.xml
===================================================================
diff -u -r44045 -r44046
--- vhUnitTest/AXimpl/Controle/Order/Admin/AdminOrderLijnIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 44045)
+++ vhUnitTest/AXimpl/Controle/Order/Admin/AdminOrderLijnIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 44046)
@@ -5,48 +5,44 @@
 
 <Method name="Test: Er zijn geen orders">
 <Implementation><![CDATA[
-	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfDataTypes).%New()))
+	#dim OrderIteratorStub As TECH.Iterator = ##class(vhTest.Mock.AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New()
+	Do OrderIteratorStub.IndienMethodCall("HasNext").DanReturn($$$False)
 	
-	#dim AdminOrderLijnIterator As AXimpl.Controle.Order.Admin.AdminOrderLijnIterator = ##class(AXimpl.Controle.Order.Admin.AdminOrderLijnIterator).%New(OrderApi)
+	#dim AdminOrderLijnIterator As AXimpl.Controle.Order.Admin.AdminOrderLijnIterator = ##class(AXimpl.Controle.Order.Admin.AdminOrderLijnIterator).%New(OrderIteratorStub)
 	
 	Do $$$AssertFalse(AdminOrderLijnIterator.HasNext())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Er is enkel een order zonder lijnen">
 <Implementation><![CDATA[
-	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Set OrderStub = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrderHoofding()
+	Do OrderStub.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
 	
-	Set Order = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrderHoofding()
-	Do Order.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))
+	Set OrderIterator = ##class(TECH.ListIterator).%New(Orders)
 	
-	#dim AdminOrderLijnIterator As AXimpl.Controle.Order.Admin.AdminOrderLijnIterator = ##class(AXimpl.Controle.Order.Admin.AdminOrderLijnIterator).%New(OrderApi)
+	#dim AdminOrderLijnIterator As AXimpl.Controle.Order.Admin.AdminOrderLijnIterator = ##class(AXimpl.Controle.Order.Admin.AdminOrderLijnIterator).%New(OrderIterator)
 	
 	Do $$$AssertFalse(AdminOrderLijnIterator.HasNext())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Er is enkel een standaard order">
 <Implementation><![CDATA[
-	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Set OrderStub = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrder()
+	Do OrderStub.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
 	
-	Set Order = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrder()
-	Do Order.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))
+	Set OrderIterator = ##class(TECH.ListIterator).%New(Orders)
 	
-	#dim Converter As AXimpl.Controle.Order.Admin.AdminOrderLijnConverter = ##class(vhTest.Dummy.AXimpl.Controle.Order.AdminOrderLijnConverter).%New()
+	#dim ConverterDummy As AXimpl.Controle.Order.Admin.AdminOrderLijnConverter = ##class(vhTest.Dummy.AXimpl.Controle.Order.AdminOrderLijnConverter).%New()
 	
-	#dim AdminOrderLijnIterator As AXimpl.Controle.Order.Admin.AdminOrderLijnIterator = ##class(AXimpl.Controle.Order.Admin.AdminOrderLijnIterator).%New(OrderApi,Converter)
+	#dim AdminOrderLijnIterator As AXimpl.Controle.Order.Admin.AdminOrderLijnIterator = ##class(AXimpl.Controle.Order.Admin.AdminOrderLijnIterator).%New(OrderIterator,ConverterDummy)
 	
 	if $$$AssertTrue(AdminOrderLijnIterator.HasNext()) {
 		Do $$$AssertEquals($ClassName(AdminOrderLijnIterator.Next()),"AXimpl.Controle.Order.OrderLijn")