diff --git a/app/main/views/send.py b/app/main/views/send.py
index 45a8cbf5a..db1ad1ead 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -803,6 +803,8 @@ def get_send_test_page_title(template_type, help_argument, entering_recipient, n
 
 
 def is_current_user_the_recipient():
+    if 'recipient' not in session:
+        return False
     if hasattr(current_user, 'phone_number'):
         return session['recipient'] in {current_user.email_address, current_user.phone_number}
     return session['recipient'] == current_user.email_address
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index b8e9073f7..f52899f51 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -1117,13 +1117,13 @@ def test_send_one_off_or_test_has_correct_page_titles(
         active_user_with_permissions,
         mock_get_service_template,
         'Use my phone number',
-        partial(url_for, 'main.send_test')
+        partial(url_for, 'main.send_test_step')
     ),
     (
         active_user_with_permissions,
         mock_get_service_email_template,
         'Use my email address',
-        partial(url_for, 'main.send_test')
+        partial(url_for, 'main.send_test_step')
     ),
     (
         active_user_with_permissions,
@@ -1166,6 +1166,7 @@ def test_send_one_off_has_skip_link(
         assert skip_links[0]['href'] == expected_link_url(
             service_id=service_one['id'],
             template_id=fake_uuid,
+            step_index=1
         )
     else:
         assert not skip_links
@@ -1679,7 +1680,7 @@ def test_send_test_indicates_optional_address_columns(
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
 
     assert normalize_spaces(page.select('label')[0].text) == (
-        'address line 4 '
+        'address line 3 '
         'Optional'
     )
     assert page.select('.page-footer-back-link')[0]['href'] == url_for(