Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r53392 -r54402
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 53392)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 54402)
@@ -29,7 +29,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>0.11</BOMQty>
+      <BOMQty>0.19</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.090.263.16</ItemId>
@@ -50,116 +50,102 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
-      <BOMQty>0.01</BOMQty>
+      <BOMQty>0.03</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.090.361.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>0.02</BOMQty>
-      <BOMQtySerie>1</BOMQtySerie>
-      <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
-      <ItemId>9.090.361.16</ItemId>
-    </BOMLine>
-    <BOMLine class="entity">
-      <BOMLine>8</BOMLine>
       <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.247.731.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>9</BOMLine>
+      <BOMLine>8</BOMLine>
       <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.705.488.1</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>10</BOMLine>
+      <BOMLine>9</BOMLine>
       <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.508.344.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>11</BOMLine>
+      <BOMLine>10</BOMLine>
       <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.644.998.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>12</BOMLine>
+      <BOMLine>11</BOMLine>
       <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.661.673.8</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>13</BOMLine>
+      <BOMLine>12</BOMLine>
       <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.683.698.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>14</BOMLine>
+      <BOMLine>13</BOMLine>
       <BOMQty>0.02</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.090.336.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>15</BOMLine>
+      <BOMLine>14</BOMLine>
       <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.383.007.12</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>16</BOMLine>
+      <BOMLine>15</BOMLine>
       <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.376.199.2</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>17</BOMLine>
+      <BOMLine>16</BOMLine>
       <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>18</BOMLine>
+      <BOMLine>17</BOMLine>
       <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>19</BOMLine>
+      <BOMLine>18</BOMLine>
       <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.964.581.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>20</BOMLine>
+      <BOMLine>19</BOMLine>
       <BOMQty>10.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.181.528.11</ItemId>
     </BOMLine>
-    <BOMLine class="entity">
-      <BOMLine>21</BOMLine>
-      <BOMQty>0.08</BOMQty>
-      <BOMQtySerie>1</BOMQtySerie>
-      <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
-      <ItemId>9.090.263.16</ItemId>
-    </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <Description>TA'OR BOX lade M
Index: AXimpl/Admin/DOM/PM/TotUniekeBouwstenenLijstOmvormer.cls.xml
===================================================================
diff -u -r54389 -r54402
--- AXimpl/Admin/DOM/PM/TotUniekeBouwstenenLijstOmvormer.cls.xml	(.../TotUniekeBouwstenenLijstOmvormer.cls.xml)	(revision 54389)
+++ AXimpl/Admin/DOM/PM/TotUniekeBouwstenenLijstOmvormer.cls.xml	(.../TotUniekeBouwstenenLijstOmvormer.cls.xml)	(revision 54402)
@@ -8,10 +8,8 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	#dim Id As %Integer = 1
-	#dim Aantal As %Integer
 	#dim BouwstenenLijstIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(BouwstenenLijst)
-	#dim Bouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen
-	#dim AanTePassenBouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen
+	#dim Bouwsteen, AanTePassenBouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen
 	Set LijstMetUniekeBouwstenen = ##class(%ListOfObjects).%New()
 	Set LijstMetUniekeIdentnummers = ##class(%ListOfDataTypes).%New()
 	
Index: AXimpl/Admin/DOM/PM/BouwsteenIterator.cls.xml
===================================================================
diff -u -r54365 -r54402
--- AXimpl/Admin/DOM/PM/BouwsteenIterator.cls.xml	(.../BouwsteenIterator.cls.xml)	(revision 54365)
+++ AXimpl/Admin/DOM/PM/BouwsteenIterator.cls.xml	(.../BouwsteenIterator.cls.xml)	(revision 54402)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TotUniekeBouwstenenLijstOmvormer">
+<Type>AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Product">
 <Type>DOM.PM.Product</Type>
 <Private>1</Private>
@@ -29,7 +34,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Product:DOM.PM.Product,Filter:TECH.Filter="",BouwsteenConverter:AXimpl.Admin.DOM.PM.BouwsteenConverter="",ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product,Filter:TECH.Filter="",BouwsteenConverter:AXimpl.Admin.DOM.PM.BouwsteenConverter="",ProductApi:DOM.PM.ProductAPI="",TotUniekeBouwstenenLijstOmvormer:AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -38,6 +43,7 @@
 	Set ..Product = Product
 	Set ..Filter = Filter
 	Set ..BouwsteenConverter = $$$Inject(BouwsteenConverter, ##class(AXimpl.Admin.DOM.PM.BouwsteenConverter).%New())
+	Set ..TotUniekeBouwstenenLijstOmvormer = $$$Inject(TotUniekeBouwstenenLijstOmvormer, ##class(AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer).%New())
 	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
 	
 	Do ..Reset()
@@ -60,8 +66,12 @@
 
 <Method name="Reset">
 <Implementation><![CDATA[
-	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..GeefBouwstenen(..Product))
+	#dim BouwstenenLijst As %ListOfObjects = ..GeefBouwstenen(..Product)
 	
+	#dim UniekeBouwstenenLijst As %ListOfObjects = ..TotUniekeBouwstenenLijstOmvormer.GeefLijstMetUniekeBouwstenen(BouwstenenLijst)
+	
+	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(UniekeBouwstenenLijst)
+	
 	Set ..DynamicIterator = ##class(TECH.DynamicIterator).%New(Iterator,, ..Filter)
 ]]></Implementation>
 </Method>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMaatwerkMetSoprHalffabricaat/1658629.xml
===================================================================
diff -u -r49640 -r54402
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMaatwerkMetSoprHalffabricaat/1658629.xml	(.../1658629.xml)	(revision 49640)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMaatwerkMetSoprHalffabricaat/1658629.xml	(.../1658629.xml)	(revision 54402)
@@ -104,13 +104,6 @@
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
     </BOMLine>
-    <BOMLine class="entity">
-      <BOMLine>14</BOMLine>
-      <BOMQty>0.00</BOMQty>
-      <BOMQtySerie>1</BOMQtySerie>
-      <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
-      <ItemId>9.605.085.3</ItemId>
-    </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <Description>Tandembox lade M
Index: vhUnitTest/AXimpl/Admin/DOM/PM/BouwsteenIterator/Test.cls.xml
===================================================================
diff -u -r54368 -r54402
--- vhUnitTest/AXimpl/Admin/DOM/PM/BouwsteenIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 54368)
+++ vhUnitTest/AXimpl/Admin/DOM/PM/BouwsteenIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 54402)
@@ -19,8 +19,10 @@
 	Do ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(..EmptyIterator())
 	Do ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(..EmptyIterator())
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
 	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub,,,,TotUniekeBouwstenenLijstOmvormerFake)
+	
 	Do $$$AssertFalse(BouwsteenIterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -62,7 +64,9 @@
 	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId2).DanReturn(KindProductStub)
 	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId3).DanReturn(KindProductStub)
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
+	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub, TotUniekeBouwstenenLijstOmvormerFake)
 		
 	Do BouwsteenConverterMock.Verifieer()
 ]]></Implementation>
@@ -92,8 +96,10 @@
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiStub.IndienMethodCall("GeefProduct", ..#RandomProductId).DanReturn(KindProductStub)
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
 	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub, TotUniekeBouwstenenLijstOmvormerFake)
+	
 	Do BouwsteenConverterMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -111,7 +117,9 @@
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", HalffabricaatBouwstenen.GetAt(2), 2, "").DanReturn(..GeefBouwsteenDummy()).ExactAantalKeer(2)
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", HalffabricaatBouwstenen.GetAt(3), 3, "").DanReturn(..GeefBouwsteenDummy()).ExactAantalKeer(2)
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
+	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock,, TotUniekeBouwstenenLijstOmvormerFake)
 	Do BouwsteenIterator.Reset()
 	
 	Do BouwsteenConverterMock.Verifieer()
@@ -142,8 +150,10 @@
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", KindHalffabricaatBouwstenen.GetAt(1), StartId + 1, "").DanReturn(..GeefBouwsteenDummy())
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", KindHalffabricaatBouwstenen.GetAt(2), StartId + 2, "").DanReturn(..GeefBouwsteenDummy())
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", KindHalffabricaatBouwstenen.GetAt(3), StartId + 3, "").DanReturn(..GeefBouwsteenDummy())
+	
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
 
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub)
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub, TotUniekeBouwstenenLijstOmvormerFake)
 
 	Do BouwsteenConverterMock.Verifieer()
 ]]></Implementation>
@@ -194,8 +204,10 @@
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiStub.IndienMethodCall("GeefProduct", ..#RandomProductId).DanReturn(KindProductStub)
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
 	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", BouwsteenConverterMock, ProductApiStub, TotUniekeBouwstenenLijstOmvormerFake)
+	
 	Do BouwsteenConverterMock.Verifieer()
 	Do $$$AssertEquals(BouwsteenDummy.Aantal, AantalOpKindBouwsteen)
 ]]></Implementation>
@@ -230,8 +242,10 @@
 	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductNummer).DanReturn(KindProductStub)
 	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(KindVanKindProductStub)
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", "", ProductApiStub)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
 	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, "", "", ProductApiStub, TotUniekeBouwstenenLijstOmvormerFake)
+	
 	Do $$$AssertEquals(BouwsteenIterator.Next().HeeftKindBouwstenen, VerwachteWaarde)
 ]]></Implementation>
 </Method>
@@ -252,8 +266,10 @@
 	#dim BouwsteenConverterStub As vhTest.Mock.AXimpl.Admin.DOM.PM.BouwsteenConverter = ##class(vhTest.Mock.AXimpl.Admin.DOM.PM.BouwsteenConverter).%New()
 	Do BouwsteenConverterStub.IndienMethodCall("Convert", Bouwstenen.GetAt(1), $$$ElkeWaarde).DanReturn(Bouwsteen)
 	
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, FilterStub, BouwsteenConverterStub)
+	#dim TotUniekeBouwstenenLijstOmvormerFake As AXimpl.Admin.DOM.PM.TotUniekeBouwstenenLijstOmvormer = ##class(vhTest.Fake.AXimpl.Admin.DOM.PM.OmvormerDieNietsDoet).%New()
 	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(ProductStub, FilterStub, BouwsteenConverterStub,,TotUniekeBouwstenenLijstOmvormerFake)
+	
 	Do $$$AssertEquals(BouwsteenIterator.HasNext(), VerwachtResultaat)
 ]]></Implementation>
 </Method>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml
===================================================================
diff -u -r49754 -r54402
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml	(.../1561083.xml)	(revision 49754)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml	(.../1561083.xml)	(revision 54402)
@@ -56,13 +56,6 @@
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.344.630.12</ItemId>
     </BOMLine>
-    <BOMLine class="entity">
-      <BOMLine>7</BOMLine>
-      <BOMQty>0.00</BOMQty>
-      <BOMQtySerie>1</BOMQtySerie>
-      <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
-      <ItemId>9.537.438.3</ItemId>
-    </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <Description>9.610.836.15
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml
===================================================================
diff -u -r51840 -r54402
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml	(.../1561072.xml)	(revision 51840)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml	(.../1561072.xml)	(revision 54402)
@@ -72,20 +72,13 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
-      <BOMQty>0.00</BOMQty>
-      <BOMQtySerie>1</BOMQtySerie>
-      <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
-      <ItemId>9.605.085.3</ItemId>
-    </BOMLine>
-    <BOMLine class="entity">
-      <BOMLine>10</BOMLine>
       <BOMQty>7.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.181.528.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>11</BOMLine>
+      <BOMLine>10</BOMLine>
       <BOMQty>0.11</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml
===================================================================
diff -u -r49640 -r54402
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml	(.../794542.xml)	(revision 49640)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml	(.../794542.xml)	(revision 54402)
@@ -23,27 +23,20 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>0.00</BOMQty>
-      <BOMQtySerie>1</BOMQtySerie>
-      <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
-      <ItemId>9.490.806.16</ItemId>
-    </BOMLine>
-    <BOMLine class="entity">
-      <BOMLine>3</BOMLine>
       <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.876.414.0</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>4</BOMLine>
+      <BOMLine>3</BOMLine>
       <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.795.258.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
-      <BOMLine>6</BOMLine>
+      <BOMLine>5</BOMLine>
       <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>