Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml
===================================================================
diff -u -r47603 -r47611
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47603)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47611)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{E1E4A51D-49B1-48D9-A9A2-56D476CB9D39}</ConfigVariantId>
+    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
     <ErrorText>Product OnbestaandProduct bestaat niet!</ErrorText>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r47603 -r47611
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47603)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47611)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{274096DC-13A4-4F5B-89DE-B47EB2A6B01D}</ConfigVariantId>
+    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
     <CostPrice>40.30</CostPrice>
     <GTIN>5415001000198</GTIN>
     <InventTransId>DummyInventTransId</InventTransId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r47603 -r47611
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47603)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47611)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{DFEB3291-9E93-421D-820A-70AECB8CD8A6}</ConfigVariantId>
+    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
     <CostPrice>28.77</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r47603 -r47611
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47603)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47611)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{3BFAA956-187C-4E76-94D1-8C97948675BD}</ConfigVariantId>
+    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
     <CostPrice>41.64</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml
===================================================================
diff -u -r45669 -r47611
--- vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 45669)
+++ vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 47611)
@@ -13,7 +13,12 @@
 <Implementation><![CDATA[
  	Do ##super()
  	
- 	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
+ 	#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)
 ]]></Implementation>
 </Method>
 
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml
===================================================================
diff -u -r47603 -r47611
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47603)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47611)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{E3EA789A-9264-47DD-B005-E2B04FC1BDCE}</ConfigVariantId>
+    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
     <CostPrice>17.75</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r47603 -r47611
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47603)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47611)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>{CD771C81-3174-4349-B677-1259B870E1C9}</ConfigVariantId>
+    <ConfigVariantId>{mock-GUID}</ConfigVariantId>
     <CostPrice>29.87</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>