Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml
===================================================================
diff -u -r51176 -r51248
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml	(.../TestTerugname.cls.xml)	(revision 51176)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml	(.../TestTerugname.cls.xml)	(revision 51248)
@@ -193,14 +193,14 @@
 	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
     Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","4321").DanReturn($$$True)
     Do HerverpakteSoprServiceMock.IndienMethodCall("GeefAantalHerverpakt","4321").DanReturn(2)
-    Do HerverpakteSoprServiceMock.VerwachtMethodCall("GeefProductIdVanKindSoprDatSoprKindHeeft", "4321").DanReturn("4321")
+    Do HerverpakteSoprServiceMock.VerwachtMethodCall("GeefProductIdVanKindSoprDatSoprKindHeeft", "4321").DanReturn("9876")
     
 	Set ProductLijnen = ##class(%ListOfObjects).%New()
 	#dim ProductLijnMock as DOM.AKP.ProductToeleveringLijn = ..GeefProductToeleveringLijn()
 	Do ProductLijnMock.VerwachtMethodCall("ZetAantal",444).DanDoeNiks() // Ter info: Input = 222 (zie bestand) en GeefAantalHerverpakt = 2 (zie boven)
 	Do ProductLijnen.Insert(ProductLijnMock)
     #dim ToeleveringMock as DOM.AKP.Toelevering = ..GeefToelevering("L||6051",ProductLijnen)
-    Do ToeleveringMock.VerwachtMethodCall("MaakNieuweProductLijn",4321).DanReturn(ProductLijnMock)
+    Do ToeleveringMock.VerwachtMethodCall("MaakNieuweProductLijn",9876).DanReturn(ProductLijnMock)
 
     #dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
 
Index: vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService/Test.cls.xml
===================================================================
diff -u -r51176 -r51248
--- vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 51176)
+++ vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 51248)
@@ -38,8 +38,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$False
-	#dim ZoekenOpSoprOfSoprKind As %String = "Sopr"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, "")
 ]]></Implementation>
@@ -59,8 +58,7 @@
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..SoprProductConverter = SoprProductConverterStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$False
-	#dim ZoekenOpSoprOfSoprKind As %String = "Sopr"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, ..#ProductId2)
 ]]></Implementation>
@@ -76,12 +74,12 @@
 	
 	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache", ..#ProductId2).DanReturn($$$False)
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRKindInCache", ..#ProductId2).DanReturn($$$False)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..SoprProductConverter = SoprProductConverterStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$False
-	#dim ZoekenOpSoprOfSoprKind As %String = "Sopr"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, "")
 ]]></Implementation>
@@ -96,13 +94,13 @@
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
 	
 	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache", ..#ProductId2).DanReturn($$$False)
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRKindInCache", ..#ProductId2).DanReturn($$$True)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..SoprProductConverter = SoprProductConverterStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$False
-	#dim ZoekenOpSoprOfSoprKind As %String = "SoprKind"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, ..#ProductId2)
 ]]></Implementation>
@@ -117,13 +115,13 @@
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
 	
 	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache", ..#ProductId2).DanReturn($$$False)
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRKindInCache", ..#ProductId2).DanReturn($$$False)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..SoprProductConverter = SoprProductConverterStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$False
-	#dim ZoekenOpSoprOfSoprKind As %String = "SoprKind"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, "")
 ]]></Implementation>
@@ -144,8 +142,7 @@
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..SoprProductConverter = SoprProductConverterStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$False
-	#dim ZoekenOpSoprOfSoprKind As %String = "Sopr"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, "")
 ]]></Implementation>
@@ -168,8 +165,7 @@
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..SoprProductConverter = SoprProductConverterStub
 	#dim MagMeerdereKinderenHebben As %Boolean = $$$True
-	#dim ZoekenOpSoprOfSoprKind As %String = "Sopr"
-	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben, ZoekenOpSoprOfSoprKind)
+	#dim KindProductId As %String = ..GeefKindProductService().GeefKindProductId(..#ProductId1, MagMeerdereKinderenHebben)
 	
 	Do $$$AssertEquals(KindProductId, ..#ProductId3)
 ]]></Implementation>
Index: AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml
===================================================================
diff -u -r51176 -r51248
--- AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51176)
+++ AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51248)
@@ -40,7 +40,7 @@
 <Method name="GeefKindProductId">
 <Description>
 OPGELET: Dit voorziet dat er slechts 1 kind mag zijn (dat een Sopr moet zijn die een SoprKind heeft), wat volgens de huidige business-logic het geval is.</Description>
-<FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean,ZoekenOpSoprOfSoprKind:%String</FormalSpec>
+<FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim SamengesteldProduct As DOM.PM.SamengesteldProduct
@@ -57,7 +57,7 @@
 	While BouwsteenIterator.HasNext() {
 		Set Bouwsteen = BouwsteenIterator.Next()
 		Set BouwsteenProductId = Bouwsteen.GeefPRNr()
-		If ((ZoekenOpSoprOfSoprKind = "Sopr") && (..SoprProductConverter.IsSOPRInCache(BouwsteenProductId))) {
+		If ((..SoprProductConverter.IsSOPRInCache(BouwsteenProductId))) {
 			If ($$$Not(MagMeerdereKinderenHebben)) {
 				If ($$$Not(BouwsteenIterator.HasNext()) && (Teller = 0)) {
 					Set KindProductId = BouwsteenProductId
@@ -69,7 +69,7 @@
 				Set KindProductId = BouwsteenProductId
 				Set ..AantalHerverpakt = Bouwsteen.GeefAantal()
 			}
-		} ElseIf ((ZoekenOpSoprOfSoprKind = "SoprKind") && (..SoprProductConverter.IsSOPRKindInCache(BouwsteenProductId))) {
+		} ElseIf ((..SoprProductConverter.IsSOPRKindInCache(BouwsteenProductId))) {
 			Set KindProductId = BouwsteenProductId
 		}
 	}
@@ -86,7 +86,7 @@
 		Quit:(..AantalHerverpakt > 0) ..AantalHerverpakt
 	}
 	
-	Do ..GeefKindProductId(ProductId, $$$False, "Sopr")
+	Do ..GeefKindProductId(ProductId, $$$False)
 	
 	Quit:((..AantalHerverpakt = 0) || (..AantalHerverpakt = "")) 1
 	
Index: vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml
===================================================================
diff -u -r51176 -r51248
--- vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51176)
+++ vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51248)
@@ -16,9 +16,9 @@
 </Method>
 
 <Method name="GeefKindProductId">
-<FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean,ZoekenOpSoprOfSoprKind:%String</FormalSpec>
+<FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKindProductId",ProductId,MagMeerdereKinderenHebben,ZoekenOpSoprOfSoprKind)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKindProductId",ProductId,MagMeerdereKinderenHebben)
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Admin/Common/HerverpakteSoprService.cls.xml
===================================================================
diff -u -r51176 -r51248
--- AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51176)
+++ AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51248)
@@ -66,9 +66,9 @@
 		If (..ProductRolApi.IsSamengesteldProduct(ProductId)) {
 			Set SamengesteldProduct = ..ProductRolApi.GeefSamengesteldProduct(ProductId)
 			If (SamengesteldProduct.IsStockOverKinderen()) {
-				Set KindSoprProductId = ..KindProductService.GeefKindProductId(ProductId, $$$False, "Sopr")
+				Set KindSoprProductId = ..KindProductService.GeefKindProductId(ProductId, $$$False)
 				If (($$$HasLength(KindSoprProductId)) && (..ProductRolApi.IsSamengesteldProduct(KindSoprProductId))) {
-					Set SoprKindProductId = ..KindProductService.GeefKindProductId(KindSoprProductId, $$$True, "SoprKind")
+					Set SoprKindProductId = ..KindProductService.GeefKindProductId(KindSoprProductId, $$$True)
 					If $$$HasLength(SoprKindProductId) {
 						Set ..KindSoprProductId = KindSoprProductId
 						Set ..AantalHerverpakt = ..KindProductService.GeefAantalHerverpakt(ProductId)
Index: vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml
===================================================================
diff -u -r51176 -r51248
--- vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51176)
+++ vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51248)
@@ -85,9 +85,9 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
 	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True).DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -156,7 +156,7 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn("")
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn("")
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -179,7 +179,7 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$False)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -202,8 +202,8 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn("")
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True).DanReturn("")
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -226,9 +226,9 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
 	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True).DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -251,8 +251,8 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn("")
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True).DanReturn("")
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -321,15 +321,15 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId55).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId3, $$$False, "Sopr").DanReturn(..#ProductId33)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId5, $$$False, "Sopr").DanReturn(..#ProductId55)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId3, $$$False).DanReturn(..#ProductId33)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId5, $$$False).DanReturn(..#ProductId55)
 	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
 	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId3).DanDoeNiks()
 	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId5).DanDoeNiks()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId33, $$$True, "SoprKind").DanReturn(..#ProductId333)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId55, $$$True, "SoprKind").DanReturn(..#ProductId555)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True).DanReturn(..#ProductId111)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId33, $$$True).DanReturn(..#ProductId333)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId55, $$$True).DanReturn(..#ProductId555)
 	
 	Set ..ProductApi = ProductApiStub
 	Set ..ProductRolApi = ProductRolApiStub
@@ -356,9 +356,9 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False).DanReturn(..#ProductId11)
 	Do KindProductServiceMock.VerwachtMethodCall("GeefAantalHerverpakt",..#ProductId1).DanReturn(2)
-	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
+	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True).DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceMock
Index: vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml
===================================================================
diff -u -r51176 -r51248
--- vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51176)
+++ vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51248)
@@ -15,7 +15,7 @@
 </Method>
 
 <Method name="GeefKindProductId">
-<FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean,ZoekenOpSoprOfSoprKind:%String</FormalSpec>
+<FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>