Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60385 -r60575
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60385)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60575)
@@ -34,11 +34,12 @@
 <ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Doorboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New()
+	Set Doorboring.SvgBox = ..BasisElementFactory.MaakSvgBox(PosX-Straal,PosY-Straal, Straal*2, Straal*2)
+	Do Doorboring.SvgBox.VoegToeID("doorboring")
 	#dim Circle As TECH.Svg.Basis.Circle = ..BasisElementFactory.MaakCirkel(Straal,Straal,Straal)
 	Do Circle.SetFill(Kleur)
-	Set Doorboring.SvgBox = ..BasisElementFactory.MaakSvgBox(PosX-Straal,PosY-Straal, Straal*2, Straal*2)
 	Do ..ElementToevoeger.VoegToeElement(Doorboring.SvgBox,Circle)
-	Do Doorboring.SvgBox.VoegToeID("doorboring")
+	
 	Quit Doorboring
 ]]></Implementation>
 </Method>
@@ -48,10 +49,11 @@
 <ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New()
-	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height,Kleur)
 	Set Puntboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
-	Do ..ElementToevoeger.VoegToeElement(Puntboring.SvgBox,CrossDiag)
 	Do Puntboring.SvgBox.VoegToeID("puntboring")
+	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height,Kleur)
+	Do ..ElementToevoeger.VoegToeElement(Puntboring.SvgBox,CrossDiag)
+	
 	Quit Puntboring
 ]]></Implementation>
 </Method>
@@ -60,14 +62,15 @@
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring</ReturnType>
 <Implementation><![CDATA[
-	Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New()
 	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height, Kleur)
 	#dim Circle As TECH.Svg.Basis.Circle = ..BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
 	Do Circle.SetFill(Kleur)
+	Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New()
 	Set Rugboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
+	Do Rugboring.SvgBox.VoegToeID("rugboring")
 	Do ..ElementToevoeger.VoegToeElement(Rugboring.SvgBox,CrossDiag)
 	Do ..ElementToevoeger.VoegToeElement(Rugboring.SvgBox,Circle)
-	Do Rugboring.SvgBox.VoegToeID("rugboring")
+	
 	Quit Rugboring
 ]]></Implementation>
 </Method>
@@ -77,13 +80,14 @@
 <ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New()
-	Set Group = ##class(TECH.Svg.Basis.Group).%New()
-	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = ..CrossFactory.MaakTCross(Width, Height, kleur)
 	Set Zijboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
+	Do Zijboring.SvgBox.VoegToeID("zijboring")
+	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = ..CrossFactory.MaakTCross(Width, Height, kleur)
+	Set Group = ##class(TECH.Svg.Basis.Group).%New()
 	Do Group.VoegToeTransform("rotate("_Rotation_" "_(Width/2)_" "_(Height/2)_")")
 	Do Group.VoegToeElement(TCross)
 	Do ..ElementToevoeger.VoegToeElement(Zijboring.SvgBox,Group)
-	Do Zijboring.SvgBox.VoegToeID("zijboring")
+
 	Quit Zijboring
 ]]></Implementation>
 </Method>
@@ -93,10 +97,11 @@
 <ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Specialeboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New()
-	#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = ..CrossFactory.MaakCrossVH(Width,Height, kleur)
 	Set Specialeboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
-	Do ..ElementToevoeger.VoegToeElement(Specialeboring.SvgBox, CrossVH)
 	Do Specialeboring.SvgBox.VoegToeID("specialeBoring")
+	#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = ..CrossFactory.MaakCrossVH(Width,Height, kleur)
+	Do ..ElementToevoeger.VoegToeElement(Specialeboring.SvgBox, CrossVH)
+	
 	Quit Specialeboring
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml
===================================================================
diff -u -r60342 -r60575
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 60342)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 60575)
@@ -7,17 +7,17 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim DoorBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring
-		Set DoorBoring = BoringElementFactory.MaakDoorBoring(0,0,5,##class(TECH.Svg.enu.Kleur).Zwart())
+		Set DoorBoring = BoringElementFactory.MaakDoorBoring(60,40,5,##class(TECH.Svg.enu.Kleur).Zwart())
 		
-		Do ..AssertSvg(DoorBoring, "<svg x=""-5"" y=""-5"" height=""10"" width=""10"" id=""doorboring"">  <circle fill=""black"" cx=""5"" cy=""5"" r=""5""></circle></svg>")
+		Do ..AssertSvg(DoorBoring, "<svg x=""55"" y=""35"" height=""10"" width=""10"" id=""doorboring"">  <circle fill=""black"" cx=""5"" cy=""5"" r=""5""></circle></svg>")
 ]]></Implementation>
 </Method>
 
 <Method name="Test invulling objecten DoorBoring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim DoorBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring
-		Set DoorBoring = BoringElementFactory.MaakDoorBoring(0,0,5,##class(TECH.Svg.enu.Kleur).Zwart())
+		Set DoorBoring = BoringElementFactory.MaakDoorBoring(60,40,5,##class(TECH.Svg.enu.Kleur).Zwart())
 		
 		Do $$$AssertEquals(DoorBoring.SvgBox.Circles.Count(),1)
 ]]></Implementation>
@@ -27,13 +27,13 @@
 <Implementation><![CDATA[
 		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-		#dim Cirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
-		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-5,-5,10,10)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel", 5,5,5).DanReturn(Cirkel)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", -5,-5,10,10).DanReturn(SvgBox)
+		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-5,-5,10,10)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel", 5,5,5).DanReturn(DummyCirkel)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 55,35,10,10).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock)
 		
-		Do BoringElementFactory.MaakDoorBoring(0,0,5)
+		Do BoringElementFactory.MaakDoorBoring(60,40,5)
 		
 		Do BasisElementFactoryMock.Verifieer()
 ]]></Implementation>
@@ -43,16 +43,16 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Puntboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring
-		Set Puntboring = BoringElementFactory.MaakPuntBoring(15,15,5,5)
-		Do ..AssertSvg(Puntboring, "<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""puntboring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""5"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""5"" y2=""0""></line></svg>")
+		Set Puntboring = BoringElementFactory.MaakPuntBoring(25,15,10,5)
+		Do ..AssertSvg(Puntboring, "<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""puntboring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""10"" y2=""0""></line></svg>")
 ]]></Implementation>
 </Method>
 
 <Method name="Test invulling objecten Puntboring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Puntboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring
-		Set Puntboring = BoringElementFactory.MaakPuntBoring(15,15,5,5)
+		Set Puntboring = BoringElementFactory.MaakPuntBoring(25,15,10,5)
 		Do $$$AssertEquals(Puntboring.SvgBox.CrossDiags.Count(),1)
 ]]></Implementation>
 </Method>
@@ -63,13 +63,13 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
-		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(CrossDiag)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossDiag)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
 		
-		Do BoringElementFactory.MaakPuntBoring(5,5,10,10)
+		Do BoringElementFactory.MaakPuntBoring(25,15,10,5)
 		
 		Do CrossFactoryMock.Verifieer()
 		Do BasisElementFactoryMock.Verifieer()
@@ -80,16 +80,16 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Rugboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring
-		Set Rugboring = BoringElementFactory.MaakRugBoring(15,15,5,5)
-		Do ..AssertSvg(Rugboring,"<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""rugboring"">  <circle fill=""black"" cx=""2.5"" cy=""2.5"" r=""2.272727272727272727""></circle>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""5"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""5"" y2=""0""></line></svg>")
+		Set Rugboring = BoringElementFactory.MaakRugBoring(25,15,10,5)
+		Do ..AssertSvg(Rugboring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""rugboring"">  <circle fill=""black"" cx=""5"" cy=""2.5"" r=""4.545454545454545455""></circle>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""10"" y2=""0""></line></svg>")
 ]]></Implementation>
 </Method>
 
 <Method name="Test invulling objecten Rugboring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Rugboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring
-		Set Rugboring = BoringElementFactory.MaakRugBoring(15,15,5,5)
+		Set Rugboring = BoringElementFactory.MaakRugBoring(25,15,10,5)
 		Do $$$AssertEquals(Rugboring.SvgBox.CrossDiags.Count(),1)
 		Do $$$AssertEquals(Rugboring.SvgBox.Circles.Count(),1)
 ]]></Implementation>
@@ -101,15 +101,15 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim Cirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
-		#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
-		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(CrossDiag)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",5,5,4.545454545454545455).DanReturn(Cirkel)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
+		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossDiag)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",5,2.5,4.545454545454545455).DanReturn(DummyCirkel)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
 		
-		Do BoringElementFactory.MaakRugBoring(5,5,10,10)
+		Do BoringElementFactory.MaakRugBoring(25,15,10,5)
 		
 		Do CrossFactoryMock.Verifieer()
 		Do BasisElementFactoryMock.Verifieer()
@@ -120,16 +120,16 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Zijboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring
-		Set Zijboring = BoringElementFactory.MaakZijBoring(15,15,5,5)
-		Do ..AssertSvg(Zijboring,"<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""zijboring"">  <g transform=""rotate(0 2.5 2.5)"">    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""5"" y2=""0""></line>    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""2.5"" y1=""0"" x2=""2.5"" y2=""5""></line>  </g></svg>")
+		Set Zijboring = BoringElementFactory.MaakZijBoring(25,15,10,5)
+		Do ..AssertSvg(Zijboring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""zijboring"">  <g transform=""rotate(0 5 2.5)"">    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""0""></line>    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""5"" y1=""0"" x2=""5"" y2=""5""></line>  </g></svg>")
 ]]></Implementation>
 </Method>
 
 <Method name="Test invulling objecten Zijboring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Zijboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring
-		Set Zijboring = BoringElementFactory.MaakZijBoring(15,15,5,5)
+		Set Zijboring = BoringElementFactory.MaakZijBoring(25,15,10,5)
 		Do $$$AssertEquals(Zijboring.SvgBox.Groups.GetAt(1).TCrosss.Count(),1)
 ]]></Implementation>
 </Method>
@@ -140,13 +140,13 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = CrossFactory.MaakTCross(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
-		Do CrossFactoryMock.VerwachtMethodCall("MaakTCross",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(TCross)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		#dim DummyTCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = CrossFactory.MaakTCross(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakTCross",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyTCross)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
 		
-		Do BoringElementFactory.MaakZijBoring(5,5,10,10)
+		Do BoringElementFactory.MaakZijBoring(25,15,10,5)
 		
 		Do CrossFactoryMock.Verifieer()
 		Do BasisElementFactoryMock.Verifieer()
@@ -157,16 +157,16 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim SpecialeBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring
-		Set SpecialeBoring = BoringElementFactory.MaakSpecialeBoring(15,15,5,5)
-		Do ..AssertSvg(SpecialeBoring,"<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""specialeBoring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""2.5"" x2=""5"" y2=""2.5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""2.5"" y1=""0"" x2=""2.5"" y2=""5""></line></svg>")
+		Set SpecialeBoring = BoringElementFactory.MaakSpecialeBoring(25,15,10,5)
+		Do ..AssertSvg(SpecialeBoring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""specialeBoring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""2.5"" x2=""10"" y2=""2.5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""5"" y1=""0"" x2=""5"" y2=""5""></line></svg>")
 ]]></Implementation>
 </Method>
 
 <Method name="Test invulling objecten Speciale Boring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim SpecialeBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring
-		Set SpecialeBoring = BoringElementFactory.MaakSpecialeBoring(15,15,5,5)
+		Set SpecialeBoring = BoringElementFactory.MaakSpecialeBoring(25,15,10,5)
 		Do $$$AssertEquals(SpecialeBoring.SvgBox.CrossVHs.Count(),1)
 ]]></Implementation>
 </Method>
@@ -177,13 +177,13 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = CrossFactory.MaakCrossVH(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
-		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossVH",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(CrossVH)
-		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		#dim DummyCrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = CrossFactory.MaakCrossVH(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossVH",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossVH)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
 		
-		Do BoringElementFactory.MaakSpecialeBoring(5,5,10,10)
+		Do BoringElementFactory.MaakSpecialeBoring(25,15,10,5)
 		
 		Do CrossFactoryMock.Verifieer()
 		Do BasisElementFactoryMock.Verifieer()