Index: vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/ZetVerpakteAfmeting/Test.cls.xml
===================================================================
diff -u -r34075 -r34081
--- vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/ZetVerpakteAfmeting/Test.cls.xml	(.../Test.cls.xml)	(revision 34075)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/ZetVerpakteAfmeting/Test.cls.xml	(.../Test.cls.xml)	(revision 34081)
@@ -79,6 +79,17 @@
 	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()
 	
+	Do MaatwerkCalcAPI.IndienMethodCall("GeefHalffabItemsBoom", $$$ElkeWaarde ,1).DanReturn(..MaakHalffabItemsBoom())
+	
+	Set WinkelkarService.MaatwerkCalcAPI = MaatwerkCalcAPI
+	
+	Quit WinkelkarService
+]]></Implementation>
+</Method>
+
+<Method name="MaakHalffabItemsBoom">
+<ReturnType>vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom</ReturnType>
+<Implementation><![CDATA[
 	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)
 	
@@ -88,11 +99,7 @@
 	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)
-	
-	Set WinkelkarService.MaatwerkCalcAPI = MaatwerkCalcAPI
-	
-	Quit WinkelkarService
+	Quit HalffabItemsBoom
 ]]></Implementation>
 </Method>