Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/UpdateVerwerkVlag/Test.cls.xml
===================================================================
diff -u -r39794 -r39956
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 39794)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 39956)
@@ -29,8 +29,6 @@
 	do ##super()
 	Set ..ImportXML = ##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1)
-	Set ..Mail = ##class(TECH.Mail.impl.Mail).%New()
-	Set ..MailApiStub = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
 ]]></Implementation>
 </Method>
 
@@ -39,10 +37,7 @@
 <Implementation><![CDATA[
 	Do ##super(TestName)
 
-	Do ..MailApiStub.IndienMethodCall("MaakNieuwMail").DanReturn(..Mail)
-	Do ..MailApiStub.IndienMethodCall("VerstuurMail", ..Mail).DanDoeNiks()
-
-	Set ..BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New(,,..MailApiStub)
+	Set ..BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New(,,##class(vhTest.Fake.TECH.Mail.MailAPI).%New())
 	#dim BLOrdRspData As TECH.MultiDim
  	Do ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).ZetTestData(.BLOrdRspData)
 	Do ..BLOrdRspService.Setup(.BLOrdRspData)
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml
===================================================================
diff -u -r39955 -r39956
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 39955)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 39956)
@@ -10,29 +10,9 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
-<Property name="MailMock">
-<Type>vhTest.Mock.TECH.Mail.Mail</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="MailApiMock">
-<Type>vhTest.Mock.TECH.Mail.MailAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super()
-	
-	Set ..MailMock = ##class(vhTest.Mock.TECH.Mail.Mail).%New()
-	Do ..MailMock.IndienMethodCall("ZetVerzender",$$$ElkeWaarde).DanDoeNiks()
-	Do ..MailMock.IndienMethodCall("ZetOnderwerp",$$$ElkeWaarde).DanDoeNiks()
-	Do ..MailMock.IndienMethodCall("ZetInhoud",$$$ElkeWaarde).DanDoeNiks()
-	Do ..MailMock.IndienMethodCall("VoegToeOntvanger",$$$ElkeWaarde).DanDoeNiks()
-	Set ..MailApiMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
-	Do ..MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(..MailMock)
-	Do ..MailApiMock.IndienMethodCall("VerstuurMail",$$$ElkeWaarde).DanDoeNiks()
+<Implementation><![CDATA[	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -41,7 +21,7 @@
 	set XmlCorrelaterSpy = ##class(vhTest.Spy.TECH.XMLCorrelater).%New()
 	set DummyEdiBestelService = ##class(vhTest.Dummy.APPS.EDI.Bestel.BestelService).%New()
 
-	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(XmlCorrelaterSpy,DummyEdiBestelService,..MailApiMock)
+	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(XmlCorrelaterSpy,DummyEdiBestelService,##class(vhTest.Fake.TECH.Mail.MailAPI).%New())
 	do Verwerker.VerwerkBestand(..BestandVolledigeNaam)
 	
 	#dim CorrelatedObjects As %ListOfObjects = XmlCorrelaterSpy.GeefObjecten()
@@ -62,7 +42,7 @@
 	
 	set DummyEdiBestelService = ##class(vhTest.Dummy.APPS.EDI.Bestel.BestelService).%New()
 	
-	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(MockCorrelator,DummyEdiBestelService,..MailApiMock)
+	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(MockCorrelator,DummyEdiBestelService,##class(vhTest.Fake.TECH.Mail.MailAPI).%New())
 	do Verwerker.VerwerkBestand(..BestandVolledigeNaam)
 	do MockCorrelator.Verifieer()
 ]]></Implementation>
@@ -77,7 +57,7 @@
 	
 	set EdiBestelServiceSpy = ##class(vhTest.Spy.APPS.EDI.Bestel.BestelService).%New()
 	
-	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(StubCorrelator,EdiBestelServiceSpy,..MailApiMock)
+	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(StubCorrelator,EdiBestelServiceSpy,##class(vhTest.Fake.TECH.Mail.MailAPI).%New())
 	do Verwerker.VerwerkBestand(..BestandVolledigeNaam)
 	
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = EdiBestelServiceSpy.GeefAanvraag()
@@ -99,7 +79,7 @@
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("BestandVerwerker : ongeldige Bestandnaam '"_BestandNaamFoutief_"'")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.InvalidInputException).%ClassName(1),Substrings))
 	
-	Set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(,,..MailApiMock)
+	Set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(,,##class(vhTest.Fake.TECH.Mail.MailAPI).%New())
 	Do Verwerker.VerwerkBestand(BestandNaamFoutief)
 ]]></Implementation>
 </Method>