Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml
===================================================================
diff -u -r44043 -r44044
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44043)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44044)
@@ -13,9 +13,15 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeAllTests">
+<Property name="ProductStub">
+<Type>vhTest.Mock.DOM.PM.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ##super()
+	Do ##super(aTestName)
 	
 	Set ..HalffabricaatBouwstenen = ##class(%ListOfObjects).%New()
 	
@@ -28,6 +34,11 @@
 	Do ..KindBouwstenen.Insert(##class(DOM.PM.Bouwstenen.BouwsteenKind).%New())
 	Do ..KindBouwstenen.Insert(##class(DOM.PM.Bouwstenen.BouwsteenKind).%New())
 	Do ..KindBouwstenen.Insert(##class(DOM.PM.Bouwstenen.BouwsteenKind).%New())
+
+	Set ..ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	
+	Do ..ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(##class(TECH.ListIterator).%New(..HalffabricaatBouwstenen))
+	Do ..ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(##class(TECH.ListIterator).%New(..KindBouwstenen))
 ]]></Implementation>
 </Method>
 
@@ -43,14 +54,8 @@
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", ..KindBouwstenen.GetAt(2)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", ..KindBouwstenen.GetAt(3)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	
-	#dim HalffabricaatBouwstenenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..HalffabricaatBouwstenen)
-	#dim KindBouwstenenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..KindBouwstenen)
-	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	Do ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(HalffabricaatBouwstenenIterator)
-	Do ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(KindBouwstenenIterator)
-	
 	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterMock)
-	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(ProductStub)
+	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(..ProductStub)
 	#dim VerwachtAantalBomLines As %Integer = ..HalffabricaatBouwstenen.Count() + ..KindBouwstenen.Count()
 	
 	Do $$$AssertEquals(BomLines.Count(), VerwachtAantalBomLines)
@@ -63,21 +68,24 @@
 <Method name="Test: BouwsteenConverter geeft elke BomLine een volgnummer">
 <Implementation><![CDATA[
 	#dim BouwsteenConverterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New()
+	
 	Do BouwsteenConverterStub.IndienMethodCall("Convert", ..HalffabricaatBouwstenen.GetAt(1)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	Do BouwsteenConverterStub.IndienMethodCall("Convert", ..HalffabricaatBouwstenen.GetAt(2)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	Do BouwsteenConverterStub.IndienMethodCall("Convert", ..HalffabricaatBouwstenen.GetAt(3)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	
-	#dim BouwstenenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..HalffabricaatBouwstenen)
-	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	Do ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(BouwstenenIterator)
-	Do ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfDataTypes).%New()))
+	Do BouwsteenConverterStub.IndienMethodCall("Convert", ..KindBouwstenen.GetAt(1)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
+	Do BouwsteenConverterStub.IndienMethodCall("Convert", ..KindBouwstenen.GetAt(2)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
+	Do BouwsteenConverterStub.IndienMethodCall("Convert", ..KindBouwstenen.GetAt(3)).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	
 	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterStub)
-	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(ProductStub)
+	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(..ProductStub)
 	
 	Do $$$AssertEquals(BomLines.GetAt(1).BOMLine, 1)
 	Do $$$AssertEquals(BomLines.GetAt(2).BOMLine, 2)
 	Do $$$AssertEquals(BomLines.GetAt(3).BOMLine, 3)
+	Do $$$AssertEquals(BomLines.GetAt(4).BOMLine, 4)
+	Do $$$AssertEquals(BomLines.GetAt(5).BOMLine, 5)
+	Do $$$AssertEquals(BomLines.GetAt(6).BOMLine, 6)
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml
===================================================================
diff -u -r44043 -r44044
--- WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44043)
+++ WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44044)
@@ -38,26 +38,40 @@
 	#dim BomLines As %ListOfObjects = ##class(%ListOfObjects).%New()
 	#dim HalffabricaatBouwstenenIterator As TECH.ListIterator = Product.GeefHFBouwstenenIterator()
 	#dim KindBouwstenenIterator As TECH.ListIterator = Product.GeefKindBouwstenenIterator()
+	#dim Teller As %Integer = 1
 	
 	While (HalffabricaatBouwstenenIterator.HasNext()) {
 		#dim HalffabricaatBouwsteen As DOM.PM.Bouwstenen.BouwsteenHalfFabr = HalffabricaatBouwstenenIterator.Next()
-		#dim HalffabricaatBomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = ..BouwsteenConverter.Convert(HalffabricaatBouwsteen)
-
-		Set HalffabricaatBomLine.BOMLine = HalffabricaatBouwstenenIterator.Key()
 		
-		Do BomLines.Insert(HalffabricaatBomLine)
+		Do BomLines.Insert(..GeefBomLine(HalffabricaatBouwsteen, Teller))
+		
+		Set Teller = Teller + 1
 	}
 	
 	While (KindBouwstenenIterator.HasNext()) {
 		#dim KindBouwsteen As DOM.PM.Bouwstenen.BouwsteenKind = KindBouwstenenIterator.Next()
-		#dim KindBomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = ..BouwsteenConverter.Convert(KindBouwsteen)
 		
-		Do BomLines.Insert(KindBomLine)
+		Do BomLines.Insert(..GeefBomLine(KindBouwsteen, Teller))
+		
+		Set Teller = Teller + 1
 	}
 	
 	Quit BomLines
 ]]></Implementation>
 </Method>
+
+<Method name="GeefBomLine">
+<FormalSpec>Bouwsteen:DOM.PM.Bouwstenen.Bouwsteen,VolgNummer:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine</ReturnType>
+<Implementation><![CDATA[
+	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = ..BouwsteenConverter.Convert(Bouwsteen)
+	
+	Set BomLine.BOMLine = VolgNummer
+	
+	Quit BomLine
+]]></Implementation>
+</Method>
 </Class>