diff --git a/enzevalos_iphoneTests/GeneratedMocks.swift b/enzevalos_iphoneTests/GeneratedMocks.swift
index 5b10d86dae3da2db27f5328473e519f832d244f8..7de07e547a9b233c1457df8580e49d97259214e3 100644
--- a/enzevalos_iphoneTests/GeneratedMocks.swift
+++ b/enzevalos_iphoneTests/GeneratedMocks.swift
@@ -1,4 +1,4 @@
-// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationModel.swift at 2020-03-26 12:47:18 +0000
+// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationModel.swift at 2020-03-26 15:41:47 +0000
 
 //
 //  AuthenticationModel.swift
@@ -653,7 +653,7 @@ import Foundation
 }
 
 
-// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationViewModel.swift at 2020-03-26 12:47:18 +0000
+// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationViewModel.swift at 2020-03-26 15:41:47 +0000
 
 //
 //  AuthenticationViewModel.swift
diff --git a/enzevalos_iphoneTests/phishing/MailComparisonTests.swift b/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
index 9218ded707c84db79e26df766a20ad674f384e68..8edc149b2de6c245df171bb8610b791a64f61982 100644
--- a/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
+++ b/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
@@ -1,6 +1,7 @@
 
 //
 import XCTest
+import Contacts
 @testable import enzevalos_iphone
 class MailComparisonTests: XCTestCase {
     let datahandler = DataHandler.handler
@@ -44,15 +45,23 @@ class MailComparisonTests: XCTestCase {
 /**************
      Code
      ******************/
-    @NSManaged public var contact: EnzevalosContact
+    @NSManaged public var eContact: EnzevalosContact
        public func compareSenderToContacts(_ mail: PersistentMail? ) -> String {
         let senderAddress = mail?.from.mailAddress
         
         // 1. ich will wissen, ob der sender bekannt ist, deshalb erst einmal equal test mit sender und kontaktbuch durch cncontact
         
-        let contacts = datahandler.getContacts()
+        let enzContacts = datahandler.getContacts()
+        for contact in enzContacts {
+        if  contact.isAddress(mailadr: senderAddress!){
+            return "is a contact"
+        }
+    
+        
+        
+        /*
         for cont in contacts{
-            let addr = mail?.from.contact?.cnContact
+            let addr = mail?.from.contact?.cnContact?.getMailAddresses()
             if addr != nil{
                 return "is a contact"
             }
@@ -60,14 +69,15 @@ class MailComparisonTests: XCTestCase {
                 return "send mails before"
             }
         }
+         
         
         // 2. ich will wissen, ob der sender schon eine mail geschickt hat, wenn nicht im kontaktbuch, deshalb vergleich mit contact
         let knownMailAddresses = contact.getMailAddresses()
         for knownAddress in knownMailAddresses{
-            if knownAddress.mailAddress == senderAddress{
+            if knownAddress.mailAddress == senderAddress!{
                 return "has alrady send an email"
             }
-            
+            */
         }
         /*
         if mail?.from.contact?.getMailAddresses() == senderAddress{
@@ -81,7 +91,9 @@ class MailComparisonTests: XCTestCase {
      End Code
      ****************/
     func createAddressBook(){
-        let _ =  datahandler.getContactByMCOAddress(address: user)
+        datahandler.reset()
+        _ = datahandler.getContactByMCOAddress(address: user)
+        datahandler.save(during: "createAddressBook")
     }
     
     func testCompareSenderToContacts () {
@@ -91,8 +103,8 @@ class MailComparisonTests: XCTestCase {
         let mail_3 = testMail(from: user_2, to: [], cc: [], bcc: [])
         let mail_4 = testMail(from: user_2, to: [], cc: [], bcc: [])
         let mailsInInbox: [PersistentMail] = [mail_1!, mail_2!, mail_3!, mail_4!]
-        XCTAssertEqual("is a contact", compareSenderToContacts(mail_1))
-//        XCTAssertEqual("send mails before", compareSenderToContacts(mail_2))
+        XCTAssertEqual("is a contact", compareSenderToContacts(mailsInInbox[0]))
+        XCTAssertEqual("false", compareSenderToContacts(mailsInInbox[1]))
 //        XCTAssertEqual("has alrady send an email", compareSenderToContacts(mailsInInbox[2]))
 //        XCTAssertEqual("false", compareSenderToContacts(mail_2))