Index: vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml
===================================================================
diff -u -r42292 -r42385
--- vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml	(.../Test.cls.xml)	(revision 42292)
+++ vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml	(.../Test.cls.xml)	(revision 42385)
@@ -7,9 +7,12 @@
 <Implementation><![CDATA[
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Message.xml")
 	
-	set MessageManager = ##class(AXimpl.MessageManager).%New()
-	#dim Message As AXaif.Message.Envelope = MessageManager.Import(FullFilename)
+	set RequestGeneratorConfigStub = ##class(vhTest.Mock.AXimpl.RequestGeneratorConfig).%New()
+	do RequestGeneratorConfigStub.IndienMethodCall("GetEnvelopeViaSubPath", FullFilename).DanReturn("AXif.Dynamics.CustomerOut.Envelope")
 	
+	set MessageManager = ##class(AXimpl.MessageManager).%New(RequestGeneratorConfigStub)
+	#dim Message As %CacheString = MessageManager.Import(FullFilename)
+	
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Code,"SchemaValidationFailed")
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Reason.Text.GetAt("EN-US"),"Invalid document schema.")
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Detail.FaultMessageList.GetAt(1).FaultMessage.GetAt("SchemaValidationFailed"),"Invalid document schema.")
@@ -20,9 +23,12 @@
 <Implementation><![CDATA[
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Message.xml")
 	
-	set MessageManager = ##class(AXimpl.MessageManager).%New()
-	#dim Message As AXaif.Message.Envelope = MessageManager.Import(FullFilename)
+	set RequestGeneratorConfigStub = ##class(vhTest.Mock.AXimpl.RequestGeneratorConfig).%New()
+	do RequestGeneratorConfigStub.IndienMethodCall("GetEnvelopeViaSubPath", FullFilename).DanReturn("AXif.Dynamics.CustomerOut.Envelope")
 	
+	set MessageManager = ##class(AXimpl.MessageManager).%New(RequestGeneratorConfigStub)
+	#dim Message As %CacheString = MessageManager.Import(FullFilename)
+	
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Code,"DuplicateMessage")
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Reason.Text.GetAt("EN-US"),"Duplicate message. Message has already been processed.")
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Detail.CustomerServiceCreateResponse.EntityKeyList.EntityKey.KeyData.GetAt(1).KeyField.GetAt(1).Field,"AccountNum")