Index: vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml
===================================================================
diff -u -r2733 -r2778
--- vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml	(.../Test.cls.xml)	(revision 2733)
+++ vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml	(.../Test.cls.xml)	(revision 2778)
@@ -3,64 +3,76 @@
 <Class name="vhUnitTest.TECH.Mail.impl.MailMessageAanpasser.MaakEmailAdressenAtVanhoeckeBe.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="MailMessage">
+<Type>%Net.MailMessage</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Aanpasser">
+<Type>TECH.Mail.impl.MailMessageAanpasser</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..MailMessage = ##class(%Net.MailMessage).%New()
+	Set ..Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
+]]></Implementation>
+</Method>
+
 <Method name="Test: enkelvoudige adres-velden : From Sender ReplyTo">
 <Implementation><![CDATA[
-	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.From = "From"
-	Set MailMessage.Sender = "Sender"
-	Set MailMessage.ReplyTo = "ReplyTo"
+	Set ..MailMessage.From = "From"
+	Set ..MailMessage.Sender = "Sender"
+	Set ..MailMessage.ReplyTo = "ReplyTo"
 	
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
-	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	Do ..Aanpasser.MaakEmailAdressenAtVanhoeckeBe(..MailMessage)
 	
-	Do $$$AssertEquals(MailMessage.From,"From@vanhoecke.be")
-	Do $$$AssertEquals(MailMessage.Sender,"Sender@vanhoecke.be")
-	Do $$$AssertEquals(MailMessage.ReplyTo,"ReplyTo@vanhoecke.be")
+	Do $$$AssertEquals(..MailMessage.From,"From@vanhoecke.be")
+	Do $$$AssertEquals(..MailMessage.Sender,"Sender@vanhoecke.be")
+	Do $$$AssertEquals(..MailMessage.ReplyTo,"ReplyTo@vanhoecke.be")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: multiple adres-veld : To">
 <Implementation><![CDATA[
-	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.To = ##class(TECH.ListUtils).CreateListOfDataTypes("Recipient1","Recipient2")
+	Set ..MailMessage.To = ##class(TECH.ListUtils).CreateListOfDataTypes("Recipient1","Recipient2")
 	
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
-	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	Do ..Aanpasser.MaakEmailAdressenAtVanhoeckeBe(..MailMessage)
 	
-	if $$$AssertEquals(MailMessage.To.Count(),2) {
-		Do $$$AssertEquals(MailMessage.To.GetAt(1),"Recipient1@vanhoecke.be")
-		Do $$$AssertEquals(MailMessage.To.GetAt(2),"Recipient2@vanhoecke.be")
+	if $$$AssertEquals(..MailMessage.To.Count(),2) {
+		Do $$$AssertEquals(..MailMessage.To.GetAt(1),"Recipient1@vanhoecke.be")
+		Do $$$AssertEquals(..MailMessage.To.GetAt(2),"Recipient2@vanhoecke.be")
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="Test: multiple adres-veld : Cc">
 <Implementation><![CDATA[
-	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.Cc = ##class(TECH.ListUtils).CreateListOfDataTypes("CarbonCopy1","CarbonCopy2")
+	Set ..MailMessage.Cc = ##class(TECH.ListUtils).CreateListOfDataTypes("CarbonCopy1","CarbonCopy2")
 	
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
-	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	Do ..Aanpasser.MaakEmailAdressenAtVanhoeckeBe(..MailMessage)
 	
-	if $$$AssertEquals(MailMessage.Cc.Count(),2) {
-		Do $$$AssertEquals(MailMessage.Cc.GetAt(1),"CarbonCopy1@vanhoecke.be")
-		Do $$$AssertEquals(MailMessage.Cc.GetAt(2),"CarbonCopy2@vanhoecke.be")
+	if $$$AssertEquals(..MailMessage.Cc.Count(),2) {
+		Do $$$AssertEquals(..MailMessage.Cc.GetAt(1),"CarbonCopy1@vanhoecke.be")
+		Do $$$AssertEquals(..MailMessage.Cc.GetAt(2),"CarbonCopy2@vanhoecke.be")
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="Test: multiple adres-veld : Bcc">
 <Implementation><![CDATA[
-	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.Bcc = ##class(TECH.ListUtils).CreateListOfDataTypes("BlindCarbonCopy1","BlindCarbonCopy2")
+	Set ..MailMessage.Bcc = ##class(TECH.ListUtils).CreateListOfDataTypes("BlindCarbonCopy1","BlindCarbonCopy2")
 	
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
 	
-	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	Do ..Aanpasser.MaakEmailAdressenAtVanhoeckeBe(..MailMessage)
 	
-	if $$$AssertEquals(MailMessage.Bcc.Count(),2) {
-		Do $$$AssertEquals(MailMessage.Bcc.GetAt(1),"BlindCarbonCopy1@vanhoecke.be")
-		Do $$$AssertEquals(MailMessage.Bcc.GetAt(2),"BlindCarbonCopy2@vanhoecke.be")
+	if $$$AssertEquals(..MailMessage.Bcc.Count(),2) {
+		Do $$$AssertEquals(..MailMessage.Bcc.GetAt(1),"BlindCarbonCopy1@vanhoecke.be")
+		Do $$$AssertEquals(..MailMessage.Bcc.GetAt(2),"BlindCarbonCopy2@vanhoecke.be")
 	}
 ]]></Implementation>
 </Method>