Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r47611 -r47679
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47611)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47679)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
+    <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
     <CostPrice>40.30</CostPrice>
     <GTIN>5415001000198</GTIN>
     <InventTransId>DummyInventTransId</InventTransId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml
===================================================================
diff -u -r47611 -r47679
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47611)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47679)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
+    <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
     <CostPrice>17.75</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml
===================================================================
diff -u -r47611 -r47679
--- vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 47611)
+++ vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 47679)
@@ -12,13 +12,8 @@
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
  	Do ##super()
- 	
- 	#dim MessageManagerStub As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
- 	Do MessageManagerStub.IndienMethodCall("GenerateID").DanReturn("{mock-GUID}")
- 	
- 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New("", "", "", "", "", MessageManagerStub)
- 	
- 	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New(RequestConverter)
+
+ 	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
 ]]></Implementation>
 </Method>
 
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml
===================================================================
diff -u -r47611 -r47679
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47611)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47679)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
+    <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
     <ErrorText>Product OnbestaandProduct bestaat niet!</ErrorText>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r47611 -r47679
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47611)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47679)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
+    <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
     <CostPrice>41.64</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r47611 -r47679
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47611)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47679)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
+    <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
     <CostPrice>29.87</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r47611 -r47679
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47611)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47679)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
+    <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
     <CostPrice>28.77</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r47603 -r47679
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 47603)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 47679)
@@ -28,13 +28,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="MessageManager">
-<Type>AXimpl.MessageManager</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",MessageManager:AXimpl.MessageManager=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -45,7 +40,6 @@
 	Set ..BouwstenenConverter = $$$Inject(BouwstenenConverter, ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New())
 	Set ..SourcingDataAreaIdBepaler = $$$Inject(SourcingDataAreaIdBepaler, ##class(WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New())
 	Set ..Formatter = $$$Inject(Formatter, ##class(AXimpl.Formatter).%New())
-	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -60,7 +54,7 @@
 	Set ConfigVariant.MessageId = MessageId
 	Set ConfigVariant.RequestMessageId = Request.MessageId
 	Set ConfigVariant.ItemId = Request.ItemId
-	Set ConfigVariant.ConfigVariantId = ..MessageManager.GenerateID()
+	Set ConfigVariant.ConfigVariantId = Request.MessageId
 	Set ConfigVariant.ConfigId = Request.ConfigId
 	Set ConfigVariant.SalesId = Request.SalesId
 	Set ConfigVariant.InventTransId = Request.InventTransId
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r47603 -r47679
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47603)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47679)
@@ -30,10 +30,7 @@
 	#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
 	Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
 	
-	#dim MessageManagerMock As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
-	Do MessageManagerMock.VerwachtMethodCall("GenerateID").DanReturn("RandomGUID")
-	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, MessageManagerMock)
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -43,7 +40,6 @@
 	Do ProductServiceMock.Verifieer()
 	Do SourcingDataAreaIdBepalerMock.Verifieer()
 	Do FormatterMock.Verifieer()
-	Do MessageManagerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -65,22 +61,18 @@
 <Method name="Test: RequestConverter vult velden altijd in">
 <Implementation><![CDATA[
 	#dim RandomMessageId As %String = "RandomMessageId"
-	#dim RandomGUID As %String = "RandomGUID"
 	
 	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 	
-	#dim MessageManagerStub As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
-	Do MessageManagerStub.IndienMethodCall("GenerateID").DanReturn(RandomGUID)
-	
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("RandomProductId")
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, "", "", "", "", MessageManagerStub)
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, RandomMessageId)
 	
 	Do $$$AssertEquals(ConfigVariant.MessageId, RandomMessageId)
 	Do $$$AssertEquals(ConfigVariant.RequestMessageId, Request.MessageId)
 	Do $$$AssertEquals(ConfigVariant.ItemId, Request.ItemId)
-	Do $$$AssertEquals(ConfigVariant.ConfigVariantId, RandomGUID)
+	Do $$$AssertEquals(ConfigVariant.ConfigVariantId, Request.MessageId)
 	Do $$$AssertEquals(ConfigVariant.ConfigId, Request.ConfigId)
 	Do $$$AssertEquals(ConfigVariant.SalesId, Request.SalesId)
 	Do $$$AssertEquals(ConfigVariant.InventTransId, Request.InventTransId)