Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57289 -r57327
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57289)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57327)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductUpdater:WSimpl.AX.CalculatedProduct.ProductUpdater="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductVolgensAxAttribuutBepaler:WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57324 -r57327
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57324)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57327)
@@ -33,8 +33,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductUpdater">
-<Type>WSimpl.AX.CalculatedProduct.ProductUpdater</Type>
+<Property name="ProductVolgensAxAttribuutBepaler">
+<Type>WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -49,7 +49,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductUpdater:WSimpl.AX.CalculatedProduct.ProductUpdater="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductVolgensAxAttribuutBepaler:WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -61,7 +61,7 @@
 	Set ..SourcingDataAreaIdBepaler = $$$Inject(SourcingDataAreaIdBepaler, ##class(WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New())
 	Set ..Formatter = $$$Inject(Formatter, ##class(AXimpl.Formatter).%New())
 	Set ..AfbeeldingService = $$$Inject(AfbeeldingService, ##class(WSimpl.AX.CalculatedProduct.AfbeeldingService).%New())
-	Set ..ProductUpdater = $$$Inject(ProductUpdater, ##class(WSimpl.AX.CalculatedProduct.ProductUpdater).%New())
+	Set ..ProductVolgensAxAttribuutBepaler = $$$Inject(ProductVolgensAxAttribuutBepaler, ##class(WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New())
 	Set ..LadeVariantBepaler = $$$Inject(LadeVariantBepaler, ##class(WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New())
 	Set ..DataMProductRepository = $$$Inject(DataMProductRepository, ##class(DOM.PM.impl.DataM.DataMProductRepository).%New())
 	
@@ -87,7 +87,7 @@
 	
 	Try {
 		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol() && (..IsLbx(ProductId, Request.Attribute))) {
-			Set Product = ..GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol(Request, ProductId)
+			Set Product = ..ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
 		} Else {
 			Set Product = ..GeefProduct(Request, ProductId)
 		}
@@ -128,58 +128,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.PM.Product</ReturnType>
-<Implementation><![CDATA[
-	#dim Product As DOM.PM.Product = ""
-	
-	If (Request.AttrVsAdminProdNr = "Customizable") {
-		Set Product = ..GeefProductCustomizableAttrVsAdminProdNr(Request, ProductId)
-	} ElseIf (Request.AttrVsAdminProdNr = "ChangeRequest") {
-		Set Product = ..GeefProductChangeRequestAttrVsAdminProdNr(Request)
-	} ElseIf (Request.AttrVsAdminProdNr = "Fixed") {
-		Set Product = ..GeefProductFixedAttrVsAdminProdNr(Request, ProductId)
-	}
-	
-	Quit Product
-]]></Implementation>
-</Method>
-
-<Method name="GeefProductCustomizableAttrVsAdminProdNr">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.PM.Product</ReturnType>
-<Implementation><![CDATA[
-	#dim Product As DOM.PM.Product = ""
-	
-	If (($$$HasLength(ProductId)) && ($$$Not(..ProductService.HeeftBezwaarVoorProductDelete(ProductId)))) {
-		Set Product = ..ProductUpdater.GeefGeupdatetProduct(Request, ProductId)
-	} Else {
-		Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request)
-	}
-	
-	Quit Product
-]]></Implementation>
-</Method>
-
-<Method name="GeefProductChangeRequestAttrVsAdminProdNr">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.PM.Product</ReturnType>
-<Implementation><![CDATA[	Quit ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request)
-]]></Implementation>
-</Method>
-
-<Method name="GeefProductFixedAttrVsAdminProdNr">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.PM.Product</ReturnType>
-<Implementation><![CDATA[	Quit ..ProductService.GeefProduct(ProductId, Request.ItemId)
-]]></Implementation>
-</Method>
-
 <Method name="GeefAttributeValueTxtVolgensAttributeName">
 <FormalSpec>AttributeLijst:%ListOfObjects,AttributeName:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57289 -r57327
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57289)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57327)
@@ -62,8 +62,8 @@
 <Type>WSimpl.AX.CalculatedProduct.AfbeeldingService</Type>
 </Property>
 
-<Property name="ProductUpdater">
-<Type>WSimpl.AX.CalculatedProduct.ProductUpdater</Type>
+<Property name="ProductVolgensAxAttribuutBepaler">
+<Type>WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -72,109 +72,63 @@
 <Private>1</Private>
 </Property>
 
-<Method name="Test: RequestConverter converteert een AxdEntityRequest naar een AxdEntityConfigVariant">
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().WisSleutel("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", ..#Applicatie)
+	
+ 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TBX">
+<Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TBX())
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().WisSleutel("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", ..#Applicatie)
+	
+ 	Do ##super()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TAX">
+<Method name="Test: RequestConverter converteert een AxdEntityRequest naar een AxdEntityConfigVariant">
 <Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX())
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$False, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+	Do ..Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het ophalen van het Product">
 <Implementation><![CDATA[
-	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
-		#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
-		
-		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
-		
-		#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, ..#RandomMessageId)
-		
-		Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$False, ..#Applicatie)
+	
+	#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
+	
+	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
+	
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, ..#RandomMessageId)
+	
+	Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het updaten van het Product">
-<Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		
-		#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
-		
-		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceStub.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		
-		#dim ProductUpdaterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater).%New()
-		Do ProductUpdaterStub.IndienMethodCall("GeefGeupdatetProduct", Request, ..#RandomProductId).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub,,,,,,ProductUpdaterStub, LadeVariantBepalerStub)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
-	}
-]]></Implementation>
-</Method>
-
 <Method name="Test: RequestConverter vult velden altijd in">
 <Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$False, ..#Applicatie)
+	
 	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 	
@@ -194,49 +148,51 @@
 
 <Method name="Test: RequestConverter vult velden in op basis van het gevonden Product">
 <Implementation><![CDATA[
-	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$False, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 
-		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(ProductStub)
-		
-		#dim RandomVariantDescription As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("RandomLangtekst1", "RandomLangtekst2")
-		#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ProductStub, $$$ElkeWaarde).DanReturn(RandomVariantDescription)
-		
-		#dim RandomBouwstenen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("RandomBouwsteen1", "RandomBouwsteen2")
-		#dim BouwstenenConverterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterStub.IndienMethodCall("Convert", ProductStub, $$$ElkeWaarde).DanReturn(RandomBouwstenen)
-		
-		#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterStub As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeNettoAankoopPrijs")
-		Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeGewicht")
-		
-		#dim AfbeeldingServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceStub.IndienMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, VariantDescriptionBepalerStub, BouwstenenConverterStub, SourcingDataAreaIdBepalerStub, FormatterStub, AfbeeldingServiceStub)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertEquals(ConfigVariant.GTIN, "RandomEANCode")
-		Do $$$AssertEquals(ConfigVariant.ProductName, "RandomKorttekst")
-		Do $$$AssertEquals(ConfigVariant.CostPrice, "GeformatteerdeNettoAankoopPrijs")
-		Do $$$AssertEqualsList(ConfigVariant.VariantDescription, RandomVariantDescription)
-		Do $$$AssertEqualsList(ConfigVariant.BOMLine, RandomBouwstenen)
-		Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, ..#RandomSourcingDataAreaId)
-		Do $$$AssertEquals(ConfigVariant.Image, ..#RandomAfbeeldingPad)
-		Do $$$AssertEquals(ConfigVariant.Weight, "GeformatteerdeGewicht")
-		Do $$$AssertEquals(ConfigVariant.Attribute.GetAt(1).ValueTxt, ..#RandomProductId)
-	}
+	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(ProductStub)
+	
+	#dim RandomVariantDescription As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("RandomLangtekst1", "RandomLangtekst2")
+	#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
+	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ProductStub, $$$ElkeWaarde).DanReturn(RandomVariantDescription)
+	
+	#dim RandomBouwstenen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("RandomBouwsteen1", "RandomBouwsteen2")
+	#dim BouwstenenConverterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
+	Do BouwstenenConverterStub.IndienMethodCall("Convert", ProductStub, $$$ElkeWaarde).DanReturn(RandomBouwstenen)
+	
+	#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
+	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
+	
+	#dim FormatterStub As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
+	Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeNettoAankoopPrijs")
+	Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeGewicht")
+	
+	#dim AfbeeldingServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
+	Do AfbeeldingServiceStub.IndienMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, VariantDescriptionBepalerStub, BouwstenenConverterStub, SourcingDataAreaIdBepalerStub, FormatterStub, AfbeeldingServiceStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertEquals(ConfigVariant.GTIN, "RandomEANCode")
+	Do $$$AssertEquals(ConfigVariant.ProductName, "RandomKorttekst")
+	Do $$$AssertEquals(ConfigVariant.CostPrice, "GeformatteerdeNettoAankoopPrijs")
+	Do $$$AssertEqualsList(ConfigVariant.VariantDescription, RandomVariantDescription)
+	Do $$$AssertEqualsList(ConfigVariant.BOMLine, RandomBouwstenen)
+	Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, ..#RandomSourcingDataAreaId)
+	Do $$$AssertEquals(ConfigVariant.Image, ..#RandomAfbeeldingPad)
+	Do $$$AssertEquals(ConfigVariant.Weight, "GeformatteerdeGewicht")
+	Do $$$AssertEquals(ConfigVariant.Attribute.GetAt(1).ValueTxt, ..#RandomProductId)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: RequestConverter laat velden leeg">
 <Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$False, ..#Applicatie)
+	
 	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
 	
 	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
@@ -257,118 +213,92 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Fixed">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TBX">
 <Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Fixed"
-				
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TBX())
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+	Do ..Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is ChangeRequest">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TAX">
 <Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "ChangeRequest"
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX())
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+	Do ..Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr = Customizable en AdminProductNummer = niet meegegeven =&gt; Nieuw product volgens kenmerken">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie WEL igv LBX">
 <Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("")
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	
+	#dim ProductVolgensAxAttribuutBepalerMock As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New()
+	Do ProductVolgensAxAttribuutBepalerMock.VerwachtMethodCall("GeefProductVolgensAttrVsAdminProdNr", Request).DanReturn(ProductStub)
+	Set ..ProductVolgensAxAttribuutBepaler = ProductVolgensAxAttribuutBepalerMock
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).LBX())
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+	
+	Do ..BouwstenenConverter.Verifieer()
+	Do ..VariantDescriptionBepaler.Verifieer()
+	Do ..ProductVolgensAxAttribuutBepaler.Verifieer()
+	Do ..SourcingDataAreaIdBepaler.Verifieer()
+	Do ..Formatter.Verifieer()
+	Do ..AfbeeldingService.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr = Customizable en AdminProductNummer = meegegeven =&gt; GeefGeupdatetProduct van ProductUpdater">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het ophalen van het Product">
 <Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		Do ProductStub.IndienMethodCall("GeefDossierNr").DanReturn(..#RandomDossierNr)
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.VerwachtMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim ProductUpdaterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater).%New()
-		Do ProductUpdaterMock.VerwachtMethodCall("GeefGeupdatetProduct", Request, ..#RandomProductId).DanReturn(ProductStub)
-		Set ..ProductUpdater = ProductUpdaterMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-		Do ..ProductUpdater.Verifieer()
-	}
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
+	
+	#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
+	
+	#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+	Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+	
+	#dim ProductVolgensAxAttribuutBepalerStub As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New()
+	Do ProductVolgensAxAttribuutBepalerStub.IndienMethodCall("GeefProductVolgensAttrVsAdminProdNr", $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
+	
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(,,,,,, ProductVolgensAxAttribuutBepalerStub, LadeVariantBepalerStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, ..#RandomMessageId)
+	
+	Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr = Customizable en AdminProductNummer = meegegeven =&gt; HeeftBezwaarVoorProductDelete =&gt; Nieuw product volgens kenmerken">
-<Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$True)
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
-]]></Implementation>
-</Method>
-
 <Method name="GeefRequestConverter">
 <FormalSpec>ProductStub:vhTest.Mock.DOM.PM.Product,Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,LadeVariant:AXimpl.PM.enu.LadeVariant=##class(AXimpl.PM.enu.LadeVariant).LBX()</FormalSpec>
 <Private>1</Private>
@@ -401,7 +331,7 @@
 	Set ..AfbeeldingService = AfbeeldingServiceMock
 	Set ..LadeVariantBepaler = LadeVariantBepalerStub
 	
-	Quit ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(..ProductService, ..VariantDescriptionBepaler, ..BouwstenenConverter, ..SourcingDataAreaIdBepaler, ..Formatter, ..AfbeeldingService, ..ProductUpdater, ..LadeVariantBepaler)
+	Quit ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(..ProductService, ..VariantDescriptionBepaler, ..BouwstenenConverter, ..SourcingDataAreaIdBepaler, ..Formatter, ..AfbeeldingService, ..ProductVolgensAxAttribuutBepaler, ..LadeVariantBepaler)
 ]]></Implementation>
 </Method>