Index: vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/ZetVerpakteAfmeting/Test.cls.xml
===================================================================
diff -u -r33842 -r34073
--- vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/ZetVerpakteAfmeting/Test.cls.xml	(.../Test.cls.xml)	(revision 33842)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/ZetVerpakteAfmeting/Test.cls.xml	(.../Test.cls.xml)	(revision 34073)
@@ -79,12 +79,14 @@
 	Set WinkelkarService = ##class(vhUnitTest.APPS.EC.Winkelkar.impl.WinkelkarService.SubClass).%New()
 	#dim MaatwerkCalcAPI As vhTest.Mock.DOM.PM.impl.MaatwerkCalcAPI = ##class(vhTest.Mock.DOM.PM.impl.MaatwerkCalcAPI).%New()
 	
-	Set HalffabItemsBoom = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
-	Set HalffabItem = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.Halffab).%New("1235098")
+	Set HalffabProduct = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.Halffab).%New("1235098")
+	Set HalffabItemOmdoos = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.StandaardHalffabItem).%New(,"FPV1_omdoos",HalffabProduct)
 	
-	Set ConcreetHalffabItem = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.StandaardHalffabItem).%New(,,HalffabItem)
+	Set SamenGesteldHalffabItemTAORRol = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem).%New(, ##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORRol).Verpakking())
+	Do SamenGesteldHalffabItemTAORRol.VoegToe(HalffabItemOmdoos)
 	
-	Do HalffabItemsBoom.IndienMethodCall("GeefHalffabItem", ##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORRol).Verpakking()).DanReturn(ConcreetHalffabItem)
+	Set HalffabItemsBoom = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
+	Do HalffabItemsBoom.IndienMethodCall("GeefHalffabItem", ##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORRol).Verpakking()).DanReturn(SamenGesteldHalffabItemTAORRol)
 	
 	Do MaatwerkCalcAPI.IndienMethodCall("GeefHalffabItemsBoom", $$$ElkeWaarde ,1).DanReturn(HalffabItemsBoom)
 	
Index: APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml
===================================================================
diff -u -r33845 -r34073
--- APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33845)
+++ APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 34073)
@@ -512,12 +512,12 @@
 <Implementation><![CDATA[
 	#dim HalffabItemsBoom As DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom = ..MaatwerkCalcAPI.GeefHalffabItemsBoom(IngegevenKenmerken) 
 
-	#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItem = HalffabItemsBoom.GeefHalffabItem(##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORRol).Verpakking())
+	#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem = HalffabItemsBoom.GeefHalffabItem(##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORRol).Verpakking())
 
 	#dim VerpakteAfmeting As APPS.Halux.common.impl.VerpakteAfmeting = ""
+
+	#dim ProductID As %String = HalffabItem.GeefHalffabItem("FPV1_omdoos").GeefHalffab().GeefProductID()
 	
-	#dim ProductID As %String = HalffabItem.GeefHalffab().GeefProductID()
-	
 	if ProductID = "1235098" {
 		Set VerpakteAfmeting = ##class(APPS.Halux.common.impl.VerpakteAfmeting).%New(245, 173, 1263)
 	} ElseIf ProductID = "1235132" {