diff --git a/tests/test_email_handler.py b/tests/test_email_handler.py
index 4f266ff4..ed21a835 100644
--- a/tests/test_email_handler.py
+++ b/tests/test_email_handler.py
@@ -11,7 +11,8 @@ from app.models import (
     AuthorizedAddress,
     IgnoredEmail,
     EmailLog,
-    Notification, VerpType,
+    Notification,
+    VerpType,
 )
 from email_handler import (
     get_mailbox_from_mail_from,
@@ -127,10 +128,11 @@ def test_prevent_5xx_from_spf(flask_client):
         {"alias_email": alias.email, "spf_result": "R_SPF_FAIL"},
     )
     envelope = Envelope()
-    envelope.mail_from = generate_verp_email(VerpType.bounce_forward, 99999999999999)
-    envelope.rcpt_tos = [msg["to"]]
+    envelope.mail_from = msg["from"]
+    #Ensure invalid email log
+    envelope.rcpt_tos = [generate_verp_email(VerpType.bounce_forward, 99999999999999)]
     result = email_handler.MailHandler()._handle(envelope, msg)
-    assert result == status.E216
+    assert status.E216 == result
 
 
 def test_preserve_5xx_with_valid_spf(flask_client):
@@ -141,10 +143,11 @@ def test_preserve_5xx_with_valid_spf(flask_client):
         {"alias_email": alias.email, "spf_result": "R_SPF_ALLOW"},
     )
     envelope = Envelope()
-    envelope.mail_from = generate_verp_email(VerpType.bounce_forward, 99999999999999)
-    envelope.rcpt_tos = [msg["to"]]
+    envelope.mail_from = msg["from"]
+    #Ensure invalid email log
+    envelope.rcpt_tos = [generate_verp_email(VerpType.bounce_forward, 99999999999999)]
     result = email_handler.MailHandler()._handle(envelope, msg)
-    assert result == status.E512
+    assert status.E512 == result
 
 
 def test_preserve_5xx_with_no_header(flask_client):
@@ -155,7 +158,8 @@ def test_preserve_5xx_with_no_header(flask_client):
         {"alias_email": alias.email},
     )
     envelope = Envelope()
-    envelope.mail_from = generate_verp_email(VerpType.bounce_forward, 99999999999999)
-    envelope.rcpt_tos = [msg["to"]]
+    envelope.mail_from = msg["from"]
+    #Ensure invalid email log
+    envelope.rcpt_tos = [generate_verp_email(VerpType.bounce_forward, 99999999999999)]
     result = email_handler.MailHandler()._handle(envelope, msg)
-    assert result == status.E512
+    assert status.E512 == result