Index: vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml
===================================================================
diff -u -r57322 -r57324
--- vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57322)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57324)
@@ -3,6 +3,11 @@
 <Class name="vhUnitTest.WSimpl.AX.CalculatedProduct.LadeVariantBepaler.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Parameter name="RandomProductId">
+<Type>%String</Type>
+<Default>RandomProductId</Default>
+</Parameter>
+
 <Property name="ProductTypeApi">
 <Type>DOM.PM.ProductTypeAPI</Type>
 </Property>
@@ -28,61 +33,42 @@
 
 <Method name="Test: Bepaal gebruikt de ProductTypeApi om de LadeVariant te bepalen voor TBX">
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
-	
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, ##class(%ListOfObjects).%New())
-	
-	Do $$$AssertEquals(LadeVariant, ##class(AXimpl.PM.enu.LadeVariant).TBX())
-	Do ProductTypeApiStub.Verifieer()
+	Do ..Assert(##class(%ListOfObjects).%New(), ##class(AXimpl.PM.enu.LadeVariant).TBX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Bepaal gebruikt de ProductTypeApi om de LadeVariant te bepalen voor LBX">
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
-	
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, ##class(%ListOfObjects).%New())
-	
-	Do $$$AssertEquals(LadeVariant, ##class(AXimpl.PM.enu.LadeVariant).LBX())
-	Do ProductTypeApiStub.Verifieer()
+	Do ..Assert(##class(%ListOfObjects).%New(), ##class(AXimpl.PM.enu.LadeVariant).LBX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Bepaal gebruikt de ProductTypeApi om de LadeVariant te bepalen voor TAX">
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
-	
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, ##class(%ListOfObjects).%New())
-	
-	Do $$$AssertEquals(LadeVariant, ##class(AXimpl.PM.enu.LadeVariant).TAX())
-	Do ProductTypeApiStub.Verifieer()
+	Do ..Assert(##class(%ListOfObjects).%New(), ##class(AXimpl.PM.enu.LadeVariant).TAX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als bepaling LadeVariant via ProductTypeApi leeg geeft =&gt; LadeVariant ophalen uit Kenmerken =&gt; TBX">
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
 	#dim AxVariant As %String = "TBX"
 	
 	#dim Kenmerk As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
@@ -93,23 +79,18 @@
 	Do KenmerkenLijst.Insert(Kenmerk)
 	
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, KenmerkenLijst)
-	
-	Do $$$AssertEquals(LadeVariant, ##class(AXimpl.PM.enu.LadeVariant).TBX())
-	Do ProductTypeApiStub.Verifieer()
+	Do ..Assert(KenmerkenLijst, ##class(AXimpl.PM.enu.LadeVariant).TBX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als bepaling LadeVariant via ProductTypeApi leeg geeft =&gt; LadeVariant ophalen uit Kenmerken =&gt; LBX">
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
 	#dim AxVariant As %String = "LBX"
 	
 	#dim Kenmerk As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
@@ -120,23 +101,18 @@
 	Do KenmerkenLijst.Insert(Kenmerk)
 	
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, KenmerkenLijst)
-	
-	Do $$$AssertEquals(LadeVariant, ##class(AXimpl.PM.enu.LadeVariant).LBX())
-	Do ProductTypeApiStub.Verifieer()
+	Do ..Assert(KenmerkenLijst, ##class(AXimpl.PM.enu.LadeVariant).LBX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als bepaling LadeVariant via ProductTypeApi leeg geeft =&gt; LadeVariant ophalen uit Kenmerken =&gt; TAX">
 <Implementation><![CDATA[
-	#dim RandomProductId As %String = "RandomProductId"
 	#dim AxVariant As %String = "TAX"
 	
 	#dim Kenmerk As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
@@ -147,17 +123,13 @@
 	Do KenmerkenLijst.Insert(Kenmerk)
 	
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
-	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
-	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(RandomProductId, KenmerkenLijst)
-	
-	Do $$$AssertEquals(LadeVariant, ##class(AXimpl.PM.enu.LadeVariant).TAX())
-	Do ProductTypeApiStub.Verifieer()
+	Do ..Assert(KenmerkenLijst, ##class(AXimpl.PM.enu.LadeVariant).TAX())
 ]]></Implementation>
 </Method>
 
@@ -167,6 +139,18 @@
 <Implementation><![CDATA[	Quit ##class(WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New(..ProductTypeApi)
 ]]></Implementation>
 </Method>
+
+<Method name="Assert">
+<FormalSpec>KenmerkenLijst:%ListOfObjects,VerwachtteLadeVariant:AXimpl.PM.enu.LadeVariant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LadeVariantBepaler As WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ..GeefLadeVariantBepaler()
+	#dim LadeVariant As AXimpl.PM.enu.LadeVariant = LadeVariantBepaler.Bepaal(..#RandomProductId, KenmerkenLijst)
+	
+	Do $$$AssertEquals(LadeVariant, VerwachtteLadeVariant)
+	Do ..ProductTypeApi.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57289 -r57324
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57289)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57324)
@@ -186,14 +186,13 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim AttributesIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(AttributeLijst)
+	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute
 	#dim AttributeValueTxt As %String = ""
 	
-	While (AttributesIterator.HasNext()) {
-		#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = AttributesIterator.Next()
-		
+	While (AttributesIterator.HasNext() && (AttributeValueTxt = "")) {
+		Set Attribute = AttributesIterator.Next()
 		If (Attribute.Name = AttributeName) {
 			Set AttributeValueTxt = Attribute.ValueTxt	
-			Continue
 		}
 	}