Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r47103 -r47485
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47103)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47485)
@@ -124,15 +124,16 @@
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	Set Request.ItemId = RandomIdentNr
 	
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", RandomIdentNr).DanReturn($$$True)
-	Do ProductApiStub.IndienMethodCall("GeefProductVolgensIdentNr", RandomIdentNr).DanReturn(ProductDummy)
+	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.VerwachtMethodCall("GeefProductIdVoorIdentNummer", RandomIdentNr).DanReturn(ProductDummy)
 
 	#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
 	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde).DanReturn("RandomSourcingDataAreaId")		
 	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub, "", "", SourcingDataAreaIdBepalerStub)
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock, "", "", SourcingDataAreaIdBepalerStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+	
+	Do ProductApiMock.Verifieer()
 ]]></Implementation>
 </Method>