Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Test.cls.xml
===================================================================
diff -u -r40950 -r45866
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Test.cls.xml	(.../Test.cls.xml)	(revision 40950)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Test.cls.xml	(.../Test.cls.xml)	(revision 45866)
@@ -3,31 +3,14 @@
 <Class name="vhUnitTest.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="MailApiStub">
-<Type>vhTest.Mock.TECH.Mail.MailAPI</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Mail">
-<Type>TECH.Mail.Mail</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
+<Method name="Test: Mail wordt verstuurd naar OV indien offerte via handel Van Hoecke">
 <Implementation><![CDATA[
-	Do ##super(aTestName)
+	Set Mail = ##class(TECH.Mail.impl.Mail).%New()
+	Set MailApiStub = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
 	
-	Set ..Mail = ##class(TECH.Mail.impl.Mail).%New()
-	Set ..MailApiStub = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
-	
-	Do ..MailApiStub.IndienMethodCall("MaakNieuwMail").DanReturn(..Mail)
-	Do ..MailApiStub.IndienMethodCall("VerstuurMail", ..Mail).DanDoeNiks()
-]]></Implementation>
-</Method>
+	Do MailApiStub.IndienMethodCall("MaakNieuwMail").DanReturn(Mail)
+	Do MailApiStub.IndienMethodCall("VerstuurMail",Mail).DanDoeNiks()
 
-<Method name="Test: Mail wordt verstuurd naar OV indien offerte via handel Van Hoecke">
-<Implementation><![CDATA[
 	#dim KlantId As %String = "KlantId"
 	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.PARTIJ.impl.DataM.DataMKlant).%New("KlantNummer")
 	#dim PartijApiStub As vhTest.Mock.DOM.PARTIJ.PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
@@ -40,12 +23,13 @@
 	#dim VerkoopApiStub As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
 	Do VerkoopApiStub.IndienMethodCall("GeefKlant", KlantId).DanReturn(KlantStub)
 	
-	#dim Offerte As APPS.VKP.Offerte = ##class(APPS.VKP.impl.Offerte).%New(KlantId)
-	#dim MailVerzender As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender).%New(..MailApiStub)
-	Do MailVerzender.Verzend(Offerte)
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	
-	Do $$$AssertEquals(..Mail.GeefOntvangers().Count(), 1)
-	Do $$$AssertInList(..Mail.GeefOntvangers(), "OV_weborder_RRegio")
+	#dim MailVerzender As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender).%New(MailApiStub,OfferteServiceStub)
+	Do MailVerzender.Verzend(##class(APPS.VKP.impl.Offerte).%New(KlantId))
+	
+	Do $$$AssertEquals(Mail.GeefOntvangers().Count(), 1)
+	Do $$$AssertInList(Mail.GeefOntvangers(), "OV_weborder_RRegio")
 ]]></Implementation>
 </Method>
 </Class>