Index: vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceMock.cls.xml
===================================================================
diff -u -r40366 -r40639
--- vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 40366)
+++ vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 40639)
@@ -3,9 +3,13 @@
 <Class name="vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.CommunicatieServiceMock">
 <Super>APPS.TRANSP.GLS.impl.CommunicatieService</Super>
 
-<Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.UnitIDBepalerMock).%New()
+<Method name="%OnNew">
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit ##super(##class(vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.CommunicatieServiceLocatorMock).%New())
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/TransportAPIMock.cls.xml
===================================================================
diff -u -r40359 -r40639
--- vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/TransportAPIMock.cls.xml	(.../TransportAPIMock.cls.xml)	(revision 40359)
+++ vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/TransportAPIMock.cls.xml	(.../TransportAPIMock.cls.xml)	(revision 40639)
@@ -18,14 +18,7 @@
 <Method name="GeefCommunicatieService">
 <FormalSpec>Transporteur:DOM.TRANSP.enu.Transporteur</FormalSpec>
 <ReturnType>APPS.TRANSP.CommunicatieService</ReturnType>
-<Implementation><![CDATA[
-	#dim CommunicatieService As APPS.TRANSP.CommunicatieService = ##super(Transporteur)
-	
-	if ..IsGLS(Transporteur) {
-		set CommunicatieService = ##class(vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.CommunicatieServiceMock).%New()	
-	}
-	
-	quit CommunicatieService
+<Implementation><![CDATA[	quit ##class(vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.CommunicatieServiceMock).%New()
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceLocatorMock.cls.xml
===================================================================
diff -u
--- vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceLocatorMock.cls.xml	(revision 0)
+++ vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceLocatorMock.cls.xml	(revision 40639)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.CommunicatieServiceLocatorMock">
+<Super>APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</Super>
+
+<Method name="GeefUnitIDBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
+<Implementation><![CDATA[	quit ##class(vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.UnitIDBepalerMock).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequestBouwer">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New($this)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r40503 -r40639
--- APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
+++ APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40639)
@@ -16,7 +16,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..CommunicatieServiceLocator = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
+	set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/GLSv1/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r40545 -r40639
--- APPS/TRANSP/GLS/GLSv1/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 40545)
+++ APPS/TRANSP/GLS/GLSv1/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 40639)
@@ -43,7 +43,6 @@
 
 <Method name="VoerUit">
 <Abstract>1</Abstract>
-<Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/GLS/impl/CommunicatieService/Template.cls.xml
===================================================================
diff -u -r40545 -r40639
--- APPS/TRANSP/GLS/impl/CommunicatieService/Template.cls.xml	(.../Template.cls.xml)	(revision 40545)
+++ APPS/TRANSP/GLS/impl/CommunicatieService/Template.cls.xml	(.../Template.cls.xml)	(revision 40639)
@@ -35,7 +35,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
+	set CommunicatieService = $$$Inject(CommunicatieService,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
 	set ..Rit = Rit
 	set ..Levering = Levering
 	set ..LeveringInfo = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefTransportService().GeefLeveringInfo(Rit.GeefID(),Levering.GeefID())