Index: vhUnitTest/DOM/ProdRes/VerwachteUitvoerAPI/GeefAantalGereserveerd/Test.cls.xml
===================================================================
diff -u -r33256 -r33263
--- vhUnitTest/DOM/ProdRes/VerwachteUitvoerAPI/GeefAantalGereserveerd/Test.cls.xml	(.../Test.cls.xml)	(revision 33256)
+++ vhUnitTest/DOM/ProdRes/VerwachteUitvoerAPI/GeefAantalGereserveerd/Test.cls.xml	(.../Test.cls.xml)	(revision 33263)
@@ -73,7 +73,7 @@
 <Implementation><![CDATA[
 	#dim QueryAPIFake As vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI = ##class(vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI).%New()
 	#dim VerwachteUitvoerAPI As DOM.ProdRes.VerwachteUitvoerAPI = ##class(DOM.ProdRes.impl.VerwachteUitvoerAPIimpl).%New(QueryAPIFake)
-	#dim Query As TECH.DynamicQuery = ..GeefQuery()	
+	#dim Query As TECH.DynamicQuery = ..GeefVerwachteQuery()	
 	#dim ResultSet As TECH.ResultSet = QueryAPIFake.GetResultSet(Query)
 	
 	Do $$$AssertTrue($IsObject(ResultSet))
@@ -84,11 +84,9 @@
 <Implementation><![CDATA[
 	#dim QueryAPIMock As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
 	#dim VerwachteUitvoerAPI As DOM.ProdRes.VerwachteUitvoerAPI = ##class(DOM.ProdRes.impl.VerwachteUitvoerAPIimpl).%New(QueryAPIMock)
-
-	#dim Query As TECH.DynamicQuery = ..GeefQuery()
-	#dim DataTransferObjectMatcher As Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(Query)
+	#dim VerwachteQueryMatcher As Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(..GeefVerwachteQuery())
 	
-	Do QueryAPIMock.VerwachtMethodCall("GetResultSet", DataTransferObjectMatcher).DanReturn(##class(TECH.ResultSet).%New())
+	Do QueryAPIMock.VerwachtMethodCall("GetResultSet", VerwachteQueryMatcher).DanReturn(##class(TECH.ResultSet).%New())
 	Do VerwachteUitvoerAPI.GeefAantalGereserveerd(..#ProductID, ..Bedrijf.VanHoecke, ..GeefReservatieFasen(), ..InclusiefTransferReservatie, ..MaxDueOut)
 	Do QueryAPIMock.Verifieer()
 ]]></Implementation>
@@ -107,7 +105,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefQuery">
+<Method name="GeefVerwachteQuery">
 <Private>1</Private>
 <ReturnType>TECH.DynamicQuery</ReturnType>
 <Implementation><![CDATA[