diff --git a/app/app/tests/test_app_urls.py b/app/app/tests/test_app_urls.py
index 449c38a9be9..ba5ac8ed7b6 100644
--- a/app/app/tests/test_app_urls.py
+++ b/app/app/tests/test_app_urls.py
@@ -50,11 +50,11 @@ def test_sitemap_resolve(self):
     def test_email_settings_reverse(self):
         """Test the email_settings url and check the reverse."""
         priv_key = token_hex(16)[:29]
-        self.assertEqual(reverse('email_settings', args=(priv_key, )), f'/email/settings/{priv_key}')
+        self.assertEqual(reverse('email_settings', args=(priv_key, )), f'/settings/email/{priv_key}')
 
     def test_email_settings_resolve(self):
         """Test the email_settings url and check the resolution."""
-        self.assertEqual(resolve('/email/settings/').view_name, 'email_settings')
+        self.assertEqual(resolve('/settings/email/').view_name, 'email_settings')
 
     def test_leaderboard_reverse(self):
         """Test the leaderboard url and check the reverse."""
diff --git a/app/dashboard/tests/test_notifications.py b/app/dashboard/tests/test_notifications.py
index d7c5798a6b5..858986cf004 100644
--- a/app/dashboard/tests/test_notifications.py
+++ b/app/dashboard/tests/test_notifications.py
@@ -57,7 +57,7 @@ def setUp(self):
     def test_build_github_notification_new_bounty(self):
         """Test the dashboard helper build_github_notification method with new_bounty."""
         message = build_github_notification(self.bounty, 'new_bounty')
-        assert message.startswith(f'__This issue now has a funding of {self.natural_value} {self.bounty.token_name}')
+        assert f'__This issue now has a funding of {self.natural_value} {self.bounty.token_name}' in message
         assert self.usdt_value in message
         assert f'[here]({self.absolute_url})' in message
         assert f'${self.amount_open_work}' in message
@@ -65,14 +65,14 @@ def test_build_github_notification_new_bounty(self):
     def test_build_github_notification_killed_bounty(self):
         """Test the dashboard helper build_github_notification method with killed_bounty."""
         message = build_github_notification(self.bounty, 'killed_bounty')
-        assert message.startswith(f"__The funding of {self.natural_value} {self.bounty.token_name} {self.usdt_value}")
+        assert f"__The funding of {self.natural_value} {self.bounty.token_name} {self.usdt_value}" in message
         assert 'Questions?' in message
         assert f'${self.amount_open_work}' in message
 
     def test_build_github_notification_increased_bounty(self):
         """Test the dashboard helper build_github_notification method with new_bounty."""
         message = build_github_notification(self.bounty, 'increased_bounty')
-        assert message.startswith(f'__The funding of this issue was increased to {self.natural_value} {self.bounty.token_name}')
+        assert f'__The funding of this issue was increased to {self.natural_value} {self.bounty.token_name}' in message
         assert self.usdt_value in message
         assert f'[here]({self.absolute_url})' in message
         assert f'${self.amount_open_work}' in message