Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Builder/HFTOBSet/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Builder/HFTOBSet/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Builder/HFTOBSet/Test.cls.xml	(revision 33298)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.Builder.HFTOBSet.Test">
+<Super>vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.Builder.Base</Super>
+
+<Method name="VulHalffabTabel">
+<FormalSpec>HalffabTabel:vhUnitTest.DOM.PM.Maatwerk.HF.impl.InMemoryHalffabTabelUT</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Halffab1 = ##class(DOM.PM.Maatwerk.Calc.HF.impl.LBX.Halffab.HalffabTiponBlumotionSetEenhedenEnMeenemers).%New(1000)
+	Set Halffab2 = ##class(DOM.PM.Maatwerk.Calc.HF.impl.LBX.Halffab.HalffabTiponBlumotionSetEenhedenEnMeenemers).%New(1001)
+	
+	Set (Halffab1.LadeDiepte, Halffab2.LadeDiepte) = ..LBXKenmerken.LadeDiepte
+	Set (Halffab1.LadeHoogte, Halffab2.LadeHoogte) = ..LBXKenmerken.LadeHoogte
+	Set (Halffab1.Draagkracht, Halffab2.Draagkracht) = ..LBXKenmerken.Draagkracht
+	
+	Set Halffab1.InterneBreedteMin = ..LBXKenmerken.InterneBreedte 
+	Set Halffab1.InterneBreedteMax = ..LBXKenmerken.InterneBreedte 
+	
+	Set Halffab2.InterneBreedteMin = Halffab1.InterneBreedteMin + 1
+	Set Halffab2.InterneBreedteMax = Halffab1.InterneBreedteMax + 1
+	
+	Do HalffabTabel.VoegToeHalffab(Halffab1)
+	Do HalffabTabel.VoegToeHalffab(Halffab2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Het juiste item weerhouden dmv selectiekenmerken en filtering op internebreedte">
+<Implementation><![CDATA[
+	Set ..LBXKenmerken.GeleiderTechnologie = ..Enum.GeleiderTechnologie.TIPONBLUMOTION
+
+	Set Builder = ##class(DOM.PM.Maatwerk.Calc.HF.impl.LBX.Builder.HFTiponBlumotionSetEenhedenEnMeenemersv000).%New("")
+	Do $$$AssertEquals(Builder.Bereken(..LBXKenmerken, ..GeefContext()).GeefHalffab().GeefProductID(), 1000)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/DOM/PM/Maatwerk/Base.cls.xml
===================================================================
diff -u -r33152 -r33298
--- vhTest/DOM/PM/Maatwerk/Base.cls.xml	(.../Base.cls.xml)	(revision 33152)
+++ vhTest/DOM/PM/Maatwerk/Base.cls.xml	(.../Base.cls.xml)	(revision 33298)
@@ -18,7 +18,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefIngegevenKenmerken">
+<Method name="ConverteerIngegevenKenmerken">
 <Final>1</Final>
 <FormalSpec>IngegevenKenmerkenDto:APPS.PM.Maatwerk.dto.IngegevenKenmerken</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/TestHalffabBuilderBase.cls.xml
===================================================================
diff -u -r33048 -r33298
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/TestHalffabBuilderBase.cls.xml	(.../TestHalffabBuilderBase.cls.xml)	(revision 33048)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/TestHalffabBuilderBase.cls.xml	(.../TestHalffabBuilderBase.cls.xml)	(revision 33298)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.TestHalffabBuilderBase">
 <Abstract>1</Abstract>
-<Super>vhUnitTest.DOM.PM.Maatwerk.HF.ITestHalffabBuilder</Super>
+<Super>vhUnitTest.DOM.PM.Maatwerk.HF.ITestHalffabBuilder,vhTest.DOM.PM.Maatwerk.LBX.Base</Super>
 
 <Method name="GeefFamilie">
 <Private>1</Private>
Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/Base.cls.xml
===================================================================
diff -u -r30916 -r33298
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/Base.cls.xml	(.../Base.cls.xml)	(revision 30916)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/Base.cls.xml	(.../Base.cls.xml)	(revision 33298)
@@ -4,53 +4,18 @@
 <Abstract>1</Abstract>
 <Super>vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.TAOR.TestHalffabBuilderBase</Super>
 
-<Property name="MaatwerkCalcAPI">
-<Type>DOM.PM.impl.MaatwerkCalcAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="TAORKenmerken">
 <Type>DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="HalffabItemsBoom">
-<Type>DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	do ##super()
-	set ..MaatwerkCalcAPI = ##class(DOM.PM.impl.MaatwerkCalcAPI).%New()
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	do ##super(aTestName)
 	set ..TAORKenmerken = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken).StandaardLade()
 ]]></Implementation>
 </Method>
-
-<Method name="AssertRolAanwezigInCustomizedBoom">
-<FormalSpec>Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Rol:%String,Builder...:DOM.PM.Maatwerk.Calc.HF.IHalffabItemBuilder</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	set RolAsserter = ##class(vhUnitTest.APPS.PM.Maatwerk.End2End.common.RolAsserter).%New($this,Kenmerken,..GeefCustomizedHalffabItemsBoom(Kenmerken,Builder...))
-	do RolAsserter.AssertRolAanwezig(Rol)
-]]></Implementation>
-</Method>
-
-<Method name="AssertRolNietAanwezigInCustomizedBoom">
-<FormalSpec>Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Rol:%String,Builder...:DOM.PM.Maatwerk.Calc.HF.IHalffabItemBuilder</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	set RolAsserter = ##class(vhUnitTest.APPS.PM.Maatwerk.End2End.common.RolAsserter).%New($this,Kenmerken,..GeefCustomizedHalffabItemsBoom(Kenmerken,Builder...))
-	do RolAsserter.AssertRolNietAanwezig(Rol)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: Default_TomV.prj.xml
===================================================================
diff -u
--- Default_TomV.prj.xml	(revision 0)
+++ Default_TomV.prj.xml	(revision 33298)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+</Export>
Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Builder/Base.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Builder/Base.cls.xml	(revision 0)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Builder/Base.cls.xml	(revision 33298)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.Builder.Base">
+<Abstract>1</Abstract>
+<Super>vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.TestHalffabBuilderBase</Super>
+
+<Property name="LBXKenmerken">
+<Type>DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##super(aTestName)
+	set ..LBXKenmerken = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken).StandaardLade()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/DOM/PM/Maatwerk/HF/ITestHalffabBuilder.cls.xml
===================================================================
diff -u -r29059 -r33298
--- vhUnitTest/DOM/PM/Maatwerk/HF/ITestHalffabBuilder.cls.xml	(.../ITestHalffabBuilder.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/HF/ITestHalffabBuilder.cls.xml	(.../ITestHalffabBuilder.cls.xml)	(revision 33298)
@@ -6,6 +6,28 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="MaatwerkCalcAPI">
+<Type>DOM.PM.MaatwerkCalcAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	set ..MaatwerkCalcAPI = ##class(DOM.PM.impl.MaatwerkCalcAPI).%New()
+	#define GewichtVanAntislipMat 1043
+
+	Do ..CleanUp()
+	#dim i As TECH.Integer
+	For i = 1000:1:1006
+	{
+		Set ^KPR(i) = ""
+		Set ^KPR(i,1) = ""
+		Set $P(^KPR(i,1), "\",13) = $$$GewichtVanAntislipMat
+	}
+]]></Implementation>
+</Method>
+
 <Method name="VulHalffabTabel">
 <Abstract>1</Abstract>
 <FormalSpec>HalffabTabel:vhUnitTest.DOM.PM.Maatwerk.HF.impl.InMemoryHalffabTabelUT</FormalSpec>
@@ -63,20 +85,21 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
+<Method name="AssertRolAanwezigInCustomizedBoom">
+<FormalSpec>Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Rol:%String,Builder...:DOM.PM.Maatwerk.Calc.HF.IHalffabItemBuilder</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#define GewichtVanAntislipMat 1043
+	set RolAsserter = ##class(vhUnitTest.APPS.PM.Maatwerk.End2End.common.RolAsserter).%New($this,Kenmerken,..GeefCustomizedHalffabItemsBoom(Kenmerken,Builder...))
+	do RolAsserter.AssertRolAanwezig(Rol)
+]]></Implementation>
+</Method>
 
-	Do ##super()
-
-	Do ..CleanUp()
-	#dim i As TECH.Integer
-	For i = 1000:1:1006
-	{
-		Set ^KPR(i) = ""
-		Set ^KPR(i,1) = ""
-		Set $P(^KPR(i,1), "\",13) = $$$GewichtVanAntislipMat
-	}
+<Method name="AssertRolNietAanwezigInCustomizedBoom">
+<FormalSpec>Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Rol:%String,Builder...:DOM.PM.Maatwerk.Calc.HF.IHalffabItemBuilder</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set RolAsserter = ##class(vhUnitTest.APPS.PM.Maatwerk.End2End.common.RolAsserter).%New($this,Kenmerken,..GeefCustomizedHalffabItemsBoom(Kenmerken,Builder...))
+	do RolAsserter.AssertRolNietAanwezig(Rol)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Afdekkappen/Base.cls.xml
===================================================================
diff -u -r32363 -r33298
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Afdekkappen/Base.cls.xml	(.../Base.cls.xml)	(revision 32363)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/LBX/Afdekkappen/Base.cls.xml	(.../Base.cls.xml)	(revision 33298)
@@ -3,8 +3,7 @@
 <Class name="vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.Afdekkappen.Base">
 <Description>
 Basisklasse voor testen afdekkappen (binnen en buiten)</Description>
-<ClassType/>
-<ProcedureBlock>1</ProcedureBlock>
+<Abstract>1</Abstract>
 <Super>vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.TestHalffabBuilderBase,vhUnitTest.DOM.PM.Maatwerk.Calc.HF.impl.LBX.LadeZijkantSpecialePicking</Super>
 
 <Method name="GeefIngegevenKenmerken">