Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57280 -r57284
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57280)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57284)
@@ -28,16 +28,6 @@
 <Default>RandomMessageId</Default>
 </Parameter>
 
-<Parameter name="RandomKorttekst">
-<Type>%String</Type>
-<Default>RandomKorttekst</Default>
-</Parameter>
-
-<Parameter name="RandomEANCode">
-<Type>%String</Type>
-<Default>RandomEANCode</Default>
-</Parameter>
-
 <Parameter name="RandomAfbeeldingPad">
 <Type>%String</Type>
 <Default>RandomAfbeeldingPad</Default>
@@ -212,8 +202,8 @@
 		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, VariantDescriptionBepalerStub, BouwstenenConverterStub, SourcingDataAreaIdBepalerStub, FormatterStub, AfbeeldingServiceStub)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
-		Do $$$AssertEquals(ConfigVariant.GTIN, ..#RandomEANCode)
-		Do $$$AssertEquals(ConfigVariant.ProductName, ..#RandomKorttekst)
+		Do $$$AssertEquals(ConfigVariant.GTIN, "RandomEANCode")
+		Do $$$AssertEquals(ConfigVariant.ProductName, "RandomKorttekst")
 		Do $$$AssertEquals(ConfigVariant.CostPrice, "GeformatteerdeNettoAankoopPrijs")
 		Do $$$AssertEqualsList(ConfigVariant.VariantDescription, RandomVariantDescription)
 		Do $$$AssertEqualsList(ConfigVariant.BOMLine, RandomBouwstenen)
@@ -340,14 +330,14 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
 		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn("")
+		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+		Do ProductServiceStub.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
+		Do ProductServiceStub.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn("")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock,,,,,,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub,,,,,,, LadeVariantBepalerStub)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -365,14 +355,14 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
 		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+		Do ProductServiceStub.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
+		Do ProductServiceStub.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock,,,,,,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub,,,,,,, LadeVariantBepalerStub)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -415,9 +405,6 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$True)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
@@ -456,17 +443,17 @@
 	#dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New()
 	Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", ..#RandomProductId, ..#RandomDossierNr).DanReturn(..ProductData)
 	
-	#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-	Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(LadeVariant)
-	Do LadeVariantBepaler.IndienMethodCall("Bepaal", "", Request.Attribute).DanReturn(LadeVariant)
+	#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+	Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(LadeVariant)
+	Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", "", Request.Attribute).DanReturn(LadeVariant)
 	
 	Set ..VariantDescriptionBepaler = VariantDescriptionBepalerMock
 	Set ..BouwstenenConverter = BouwstenenConverterMock
 	Set ..SourcingDataAreaIdBepaler = SourcingDataAreaIdBepalerMock
 	Set ..Formatter = FormatterMock
 	Set ..AfbeeldingService = AfbeeldingServiceMock
 	Set ..ProductDataFactory = ProductDataFactoryStub
-	Set ..LadeVariantBepaler = LadeVariantBepaler
+	Set ..LadeVariantBepaler = LadeVariantBepalerStub
 	
 	Quit ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(..ProductService, ..VariantDescriptionBepaler, ..BouwstenenConverter, ..SourcingDataAreaIdBepaler, ..Formatter, ..AfbeeldingService, ..ProductDataFactory, ..LadeVariantBepaler)
 ]]></Implementation>
@@ -477,9 +464,8 @@
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
 	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	
-	Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-	Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
+	Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn("RandomEANCode")
+	Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn("RandomKorttekst")
 	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
 	Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
 	Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
@@ -495,7 +481,6 @@
 <ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</ReturnType>
 <Implementation><![CDATA[
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	
 	Set Request.ItemId = "RandomRequestItemId"
 	Set Request.ConfigId = "RandomRequestConfigId"
 	Set Request.SalesId = "RandomRequestSalesId"
@@ -514,7 +499,6 @@
 <ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</ReturnType>
 <Implementation><![CDATA[
 	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
-	
 	Set Attribute.Name = Name
 	Set Attribute.ValueTxt = Value