Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetZwaardereColli.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetZwaardereColli.cls.xml	(.../TestLeveringMetZwaardereColli.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetZwaardereColli.cls.xml	(.../TestLeveringMetZwaardereColli.cls.xml)	(revision 40633)
@@ -10,7 +10,7 @@
 
 <Method name="TestNormaal">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 30
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestBase.cls.xml
===================================================================
diff -u -r40477 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 40477)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 40633)
@@ -21,12 +21,17 @@
 <Default>1202109</Default>
 </Parameter>
 
+<Property name="CommunicatieServiceLocatorMock">
+<Type>vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.CommunicatieServiceMock</Type>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
  	Do ##super(aTestName)
  	Do ##class(TECH.Context).Instance().PushMailAPIClassName(##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%ClassName(1))
  	Do ##class(APPS.ApplicatieContext).Instance().PushTransportAPIClassName(##class(vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.TransportAPIMock).%ClassName(1))
+ 	Set ..CommunicatieServiceLocatorMock = ##class(vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.CommunicatieServiceMock).%New()
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/RequestDataBouwerMock.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/RequestDataBouwerMock.cls.xml	(.../RequestDataBouwerMock.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/RequestDataBouwerMock.cls.xml	(.../RequestDataBouwerMock.cls.xml)	(revision 40633)
@@ -10,14 +10,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LaatsteUnitIDVanRit:%String</FormalSpec>
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator,LaatsteUnitIDVanRit:%String</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..LaatsteUnitIDVanRit = LaatsteUnitIDVanRit
-	Quit $$$OK
+	
+	Quit ##super(CommunicatieServiceLocator)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetParcelCashOnDelivery.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetParcelCashOnDelivery.cls.xml	(.../TestLeveringMetParcelCashOnDelivery.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetParcelCashOnDelivery.cls.xml	(.../TestLeveringMetParcelCashOnDelivery.cls.xml)	(revision 40633)
@@ -10,7 +10,7 @@
 
 <Method name="TestNormaal">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 2.3
@@ -46,7 +46,7 @@
 
 <Method name="TestMultiColli">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 9
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringBuitenEuropaMetColli.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringBuitenEuropaMetColli.cls.xml	(.../TestLeveringBuitenEuropaMetColli.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringBuitenEuropaMetColli.cls.xml	(.../TestLeveringBuitenEuropaMetColli.cls.xml)	(revision 40633)
@@ -5,7 +5,7 @@
 
 <Method name="TestNormaal">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 2.3
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/MaakReleaseRequests/Test.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/MaakReleaseRequests/Test.cls.xml	(.../Test.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/MaakReleaseRequests/Test.cls.xml	(.../Test.cls.xml)	(revision 40633)
@@ -165,7 +165,8 @@
 <FormalSpec>LaatsteUnitIDVanRit:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.RequestDataBouwerMock).%New(LaatsteUnitIDVanRit)
+	Set CommunicatieServiceLocator = ##class(vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.CommunicatieServiceMock).%New()
+	Set RequestBouwer = ##class(vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.RequestDataBouwerMock).%New(CommunicatieServiceLocator,LaatsteUnitIDVanRit)
 	quit RequestBouwer.MaakReleaseRequests(..VerzendDataLijst)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/CommunicatieServiceMock.cls.xml
===================================================================
diff -u -r40366 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 40366)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 40633)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.CommunicatieServiceMock">
-<Super>APPS.TRANSP.GLS.impl.CommunicatieService</Super>
+<Super>APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</Super>
 
 <Method name="GeefUnitIDBepaler">
 <ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetParcelDeposit.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetParcelDeposit.cls.xml	(.../TestLeveringMetParcelDeposit.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetParcelDeposit.cls.xml	(.../TestLeveringMetParcelDeposit.cls.xml)	(revision 40633)
@@ -10,7 +10,7 @@
 
 <Method name="TestNormaal">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 2.3
Index: APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r40533 -r40633
--- APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40533)
+++ APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40633)
@@ -3,18 +3,25 @@
 <Class name="APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer">
 <Super>TECH.RegisteredObject,APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</Super>
 
+<Property name="CommunicatieServiceLocator">
+<Type>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="T854SuffixBepaler">
 <Type>APPS.TRANSP.GLS.GLSv1.Bericht.impl.T854SuffixBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <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[
 	set ..T854SuffixBepaler = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.T854SuffixBepaler).%New()
+	Set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -89,8 +96,7 @@
 <FormalSpec>VerzendData:APPS.TRANSP.GLS.dto.VerzendData,IsLaatsteUnit:%Boolean=0</FormalSpec>
 <ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelReleaseRequest</ReturnType>
 <Implementation><![CDATA[
-	#dim CommunicatieServiceLocator As APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
-	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = CommunicatieServiceLocator.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..CommunicatieServiceLocator.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
 	
 	#dim ReleaseRequest As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ReleaseRequest
 	if Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight() {
@@ -356,9 +362,7 @@
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim CommunicatieService As APPS.TRANSP.GLS.impl.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgiumDistribution())
-	quit CommunicatieService.GeefUnitIDBepaler().GeefUnitID(VerzendWijze)
+<Implementation><![CDATA[	quit ..CommunicatieServiceLocator.GeefUnitIDBepaler().GeefUnitID(VerzendWijze)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringParcelServiceTypes.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringParcelServiceTypes.cls.xml	(.../TestLeveringParcelServiceTypes.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringParcelServiceTypes.cls.xml	(.../TestLeveringParcelServiceTypes.cls.xml)	(revision 40633)
@@ -5,7 +5,7 @@
 
 <Method name="TestLaagGewicht">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 2.3
@@ -26,7 +26,7 @@
 
 <Method name="TestGemiddeldGewicht">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 40
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringEuropaMetColli.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringEuropaMetColli.cls.xml	(.../TestLeveringEuropaMetColli.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringEuropaMetColli.cls.xml	(.../TestLeveringEuropaMetColli.cls.xml)	(revision 40633)
@@ -10,7 +10,7 @@
 
 <Method name="TestNormaal">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 2.3
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetColli.cls.xml
===================================================================
diff -u -r40367 -r40633
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetColli.cls.xml	(.../TestLeveringMetColli.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetColli.cls.xml	(.../TestLeveringMetColli.cls.xml)	(revision 40633)
@@ -10,7 +10,7 @@
 
 <Method name="TestNormaal">
 <Implementation><![CDATA[
-	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+	Set RequestBouwer = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New(..CommunicatieServiceLocatorMock)
 	
 	#dim LeveringData As APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringData()
 	Set LeveringData.Gewicht = 2.3