Index: vhCARETAKER.mac.rou
===================================================================
diff -u -r40810 -r43122
--- vhCARETAKER.mac.rou	(.../vhCARETAKER.mac.rou)	(revision 40810)
+++ vhCARETAKER.mac.rou	(.../vhCARETAKER.mac.rou)	(revision 43122)
@@ -281,6 +281,7 @@
 ImportBlumXMLFacturen	; Import Blum Fakturen
 	try { 
  		Do InitRuntimeContext
+ 		do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AankoopControle")
  		do ##class(APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger).%New().Ontvang()
 	}
 	catch(Exceptie) {
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2/Ontvang/Test.cls.xml
===================================================================
diff -u -r40226 -r43122
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 40226)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 43122)
@@ -18,6 +18,8 @@
 	Set ..VolledigeBestandNaam1 = ..GeefDespatchFileLocatie() _"DESADV_1234567891_dummy.xml"	;
 	Set ..VolledigeBestandNaam2 = ..GeefDespatchFileLocatie() _"DESADV_1234567892_dummy.xml"	;
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie(),..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1,..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",1,..#Applicatie)
 ]]></Implementation>
 </Method>
 
Index: BLIMP.mac.rou
===================================================================
diff -u -r38657 -r43122
--- BLIMP.mac.rou	(.../BLIMP.mac.rou)	(revision 38657)
+++ BLIMP.mac.rou	(.../BLIMP.mac.rou)	(revision 43122)
@@ -32,6 +32,7 @@
  Quit
  
 SCAN ; Achtergrond job dat alle EDI-bestanden verwerkt 
+ do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AankoopControle")
  Do ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New().Ontvang()
  Do ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New().Ontvang()
  Do ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvangerV2).%New().Ontvang()
@@ -158,4 +159,3 @@
 
 
 
-
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r43050 -r43122
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 43050)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 43122)
@@ -8,15 +8,7 @@
 <Implementation><![CDATA[
 	do ##super()
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1,..#Applicatie)
-	
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",0,..#Applicatie)
-]]></Implementation>
-</Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie(),..#Applicatie)
 ]]></Implementation>
 </Method>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml
===================================================================
diff -u -r38653 -r43122
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 38653)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 43122)
@@ -3,11 +3,6 @@
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger">
 <Super>TECH.RegisteredObject</Super>
 
-<Parameter name="Applicatie">
-<Type>%String</Type>
-<Default>AankoopControle</Default>
-</Parameter>
-
 <Property name="XmlCorrelater">
 <Type>TECH.XMLCorrelater</Type>
 <Private>1</Private>
@@ -45,7 +40,6 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie(..#Applicatie)
 	set ..Logger = ##class(vhLib.Logger).%New()
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())
Index: APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml
===================================================================
diff -u -r38978 -r43122
--- APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 38978)
+++ APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 43122)
@@ -3,11 +3,6 @@
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger">
 <Super>TECH.RegisteredObject</Super>
 
-<Parameter name="Applicatie">
-<Type>%String</Type>
-<Default>AankoopControle</Default>
-</Parameter>
-
 <Property name="INVOIC02Verwerker">
 <Type>APPS.AKP.AankoopControle.BLUM.INVOIC02Verwerker</Type>
 <Private>1</Private>
@@ -39,7 +34,6 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
- 	do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie(..#Applicatie)
 	set ..Logger = ##class(vhLib.Logger).%New()
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())
Index: APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Ontvanger.cls.xml
===================================================================
diff -u -r38146 -r43122
--- APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Ontvanger.cls.xml	(.../Ontvanger.cls.xml)	(revision 38146)
+++ APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Ontvanger.cls.xml	(.../Ontvanger.cls.xml)	(revision 43122)
@@ -3,11 +3,6 @@
 <Class name="APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger">
 <Super>TECH.RegisteredObject</Super>
 
-<Parameter name="Applicatie">
-<Type>%String</Type>
-<Default>AankoopControle</Default>
-</Parameter>
-
 <Property name="XmlCorrelater">
 <Type>TECH.XMLCorrelater</Type>
 <Private>1</Private>
@@ -44,7 +39,6 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie(..#Applicatie)
 	set ..Logger = ##class(vhLib.Logger).%New()
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2.cls.xml
===================================================================
diff -u -r38996 -r43122
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2.cls.xml	(.../DespatchBerichtOntvangerV2.cls.xml)	(revision 38996)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2.cls.xml	(.../DespatchBerichtOntvangerV2.cls.xml)	(revision 43122)
@@ -3,11 +3,6 @@
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvangerV2">
 <Super>TECH.RegisteredObject</Super>
 
-<Parameter name="Applicatie">
-<Type>%String</Type>
-<Default>AankoopControle</Default>
-</Parameter>
-
 <Property name="XmlCorrelater">
 <Type>TECH.XMLCorrelater</Type>
 <Private>1</Private>
@@ -50,7 +45,6 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie(..#Applicatie)	
 	Set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	Set ..DateTimeApi = $$$Inject(DateTimeAPI,##class(TECH.Context).Instance().GeefDateTimeAPI())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())