Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger/Test.cls.xml
===================================================================
diff -u -r61598 -r61609
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger/Test.cls.xml	(.../Test.cls.xml)	(revision 61598)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger/Test.cls.xml	(.../Test.cls.xml)	(revision 61609)
@@ -88,7 +88,7 @@
 	
 	Set HoekverbinderMakerMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Hoekverbinder.HoekverbinderMaker).%New()
 	Do HoekverbinderMakerMock.VerwachtMethodCall("MaakHoekverbinderRechtsOnder").DanReturn(Hoekverbinder)
-	Do HoekverbinderMakerMock.VerwachtMethodCall("MaakHoekverbinderRechtsOnder").DanReturn(Hoekverbinder)
+	Do HoekverbinderMakerMock.VerwachtMethodCall("MaakHoekverbinderLinksOnder").DanReturn(Hoekverbinder)
 	Do HoekverbinderMakerMock.VerwachtMethodCall("ZetVerbinderParameters", Kaderdeur)
 	set VerbinderGroup =##class(TECH.Svg.Basis.Group).%New()
 	Set ElementToevoegerMock = ##class(vhTest.Mock.TECH.Svg.Basis.SvgBox.ElementToevoeger).%New()
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Hoekverbinder/HoekverbinderMaker/Test.cls.xml
===================================================================
diff -u -r61605 -r61609
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Hoekverbinder/HoekverbinderMaker/Test.cls.xml	(.../Test.cls.xml)	(revision 61605)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Hoekverbinder/HoekverbinderMaker/Test.cls.xml	(.../Test.cls.xml)	(revision 61609)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Hoekverbinder.HoekverbinderMaker.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test aanmaken objecten voor hoekverbinder links boven">
+<Method name="aTest aanmaken objecten voor hoekverbinder links boven">
 <Implementation><![CDATA[
 	
 	#dim Kaderdeur as Prod.GADef.KaderDeur = ##class(vhTest.Utils.APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).StandaardKaderdeurMetBeslagEnBoringLosProfiel()
@@ -43,13 +43,16 @@
 	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Set BasisElementFactory	= ##class(TECH.Svg.BasisElementFactory).%New()	
-	;#dim Coordinateslist As %ListOfObjects = ##class(vhTest.Utils.TECH.Svg.Basis.Path.Coordinates.CoordinatesList).CoordinatesListHoekverbinderBreed()
+	
 	#dim Coordinateslist As %ListOfObjects = CoordinatesService.MaakCoordinatenLijstVanPunten(1,1,61,1,61,1,61,41,41,41,41,61,1,61)
 	#dim Path As TECH.Svg.Basis.Path = BasisElementFactory.MaakPath(Coordinateslist)
 	#dim Cirkel1 As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(39,19,3)
 	#dim Cirkel2 As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(19,39,3)
 	
 	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",1,1,61,1,61,1,61,41,41,41,41,61,1,61).DanReturn(Coordinateslist)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPath",Coordinateslist,1).DanReturn(Path)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",39,19,3).DanReturn(Cirkel1)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",19,39,3).DanReturn(Cirkel2)
 	Set HoekverbinderMaker = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Hoekverbinder.HoekverbinderMaker).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 
 	Do HoekverbinderMaker.ZetVerbinderParameters(Kaderdeur)
@@ -68,7 +71,7 @@
 	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Set BasisElementFactory	= ##class(TECH.Svg.BasisElementFactory).%New()	
-	;#dim Coordinateslist As %ListOfObjects = ##class(vhTest.Utils.TECH.Svg.Basis.Path.Coordinates.CoordinatesList).CoordinatesListHoekverbinderBreed()
+	
 	#dim Coordinateslist As %ListOfObjects = CoordinatesService.MaakCoordinatenLijstVanPunten(1,1,61,1,61,1,61,41,41,41,41,61,1,61)
 	#dim Path As TECH.Svg.Basis.Path = BasisElementFactory.MaakPath(Coordinateslist)
 	#dim Cirkel1 As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(39,19,3)
@@ -96,7 +99,7 @@
 	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Set BasisElementFactory	= ##class(TECH.Svg.BasisElementFactory).%New()	
-	;#dim Coordinateslist As %ListOfObjects = ##class(vhTest.Utils.TECH.Svg.Basis.Path.Coordinates.CoordinatesList).CoordinatesListHoekverbinderBreed()
+	
 	#dim Coordinateslist As %ListOfObjects = CoordinatesService.MaakCoordinatenLijstVanPunten(1,1,61,1,61,1,61,41,41,41,41,61,1,61)
 	#dim Path As TECH.Svg.Basis.Path = BasisElementFactory.MaakPath(Coordinateslist)
 	#dim Cirkel1 As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(39,19,3)
@@ -125,7 +128,7 @@
 	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Set BasisElementFactory	= ##class(TECH.Svg.BasisElementFactory).%New()	
-	;#dim Coordinateslist As %ListOfObjects = ##class(vhTest.Utils.TECH.Svg.Basis.Path.Coordinates.CoordinatesList).CoordinatesListHoekverbinderBreed()
+	
 	#dim Coordinateslist As %ListOfObjects = CoordinatesService.MaakCoordinatenLijstVanPunten(1,1,61,1,61,1,61,41,41,41,41,61,1,61)
 	#dim Path As TECH.Svg.Basis.Path = BasisElementFactory.MaakPath(Coordinateslist)
 	#dim Cirkel1 As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(39,19,3)