diff --git a/tests/app/main/views/uploads/test_upload_hub.py b/tests/app/main/views/uploads/test_upload_hub.py
index 96223e660..0756c55fe 100644
--- a/tests/app/main/views/uploads/test_upload_hub.py
+++ b/tests/app/main/views/uploads/test_upload_hub.py
@@ -17,7 +17,7 @@ def test_get_upload_hub_with_no_uploads(
     mocker,
     client_request,
     service_one,
-    mock_get_no_uploads,
+    _mock_get_no_uploads,
     extra_permissions,
     expected_empty_message,
 ):
@@ -67,7 +67,7 @@ def test_get_upload_hub_page(
 def test_uploads_page_shows_scheduled_jobs(
     mocker,
     client_request,
-    mock_get_no_uploads,
+    _mock_get_no_uploads,
     mock_get_jobs,
     user,
 ):
diff --git a/tests/conftest.py b/tests/conftest.py
index 4fc2f5490..5a9ed3d0f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -50,20 +50,20 @@ def notify_admin():
     ctx.push()
 
     app.test_client_class = TestClient
-    yield app
+    return app
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def service_one(api_user_active):
     return service_json(SERVICE_ONE_ID, "service one", [api_user_active["id"]])
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def service_two(api_user_active):
     return service_json(SERVICE_TWO_ID, "service two", [api_user_active["id"]])
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def multiple_reply_to_email_addresses(mocker):
     def _get(service_id):
         return [
@@ -99,7 +99,7 @@ def multiple_reply_to_email_addresses(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def no_reply_to_email_addresses(mocker):
     def _get(service_id):
         return []
@@ -109,7 +109,7 @@ def no_reply_to_email_addresses(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def single_reply_to_email_address(mocker):
     def _get(service_id):
         return [
@@ -128,7 +128,7 @@ def single_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def get_default_reply_to_email_address(mocker):
     def _get(service_id, reply_to_email_id):
         return {
@@ -145,7 +145,7 @@ def get_default_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def get_non_default_reply_to_email_address(mocker):
     def _get(service_id, reply_to_email_id):
         return {
@@ -162,7 +162,7 @@ def get_non_default_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_add_reply_to_email_address(mocker):
     def _add_reply_to(service_id, email_address, is_default=False):
         return
@@ -172,7 +172,7 @@ def mock_add_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_reply_to_email_address(mocker):
     def _update_reply_to(
         service_id, reply_to_email_id, email_address=None, active=None, is_default=False
@@ -185,7 +185,7 @@ def mock_update_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def multiple_sms_senders(mocker):
     def _get(service_id):
         return [
@@ -221,7 +221,7 @@ def multiple_sms_senders(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def multiple_sms_senders_with_diff_default(mocker):
     def _get(service_id):
         return [
@@ -257,7 +257,7 @@ def multiple_sms_senders_with_diff_default(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def multiple_sms_senders_no_inbound(mocker):
     def _get(service_id):
         return [
@@ -284,7 +284,7 @@ def multiple_sms_senders_no_inbound(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def no_sms_senders(mocker):
     def _get(service_id):
         return []
@@ -292,7 +292,7 @@ def no_sms_senders(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def single_sms_sender(mocker):
     def _get(service_id):
         return [
@@ -310,7 +310,7 @@ def single_sms_sender(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def get_default_sms_sender(mocker):
     def _get(service_id, sms_sender_id):
         return {
@@ -326,7 +326,7 @@ def get_default_sms_sender(mocker):
     return mocker.patch("app.service_api_client.get_sms_sender", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def get_non_default_sms_sender(mocker):
     def _get(service_id, sms_sender_id):
         return {
@@ -342,7 +342,7 @@ def get_non_default_sms_sender(mocker):
     return mocker.patch("app.service_api_client.get_sms_sender", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_add_sms_sender(mocker):
     def _add_sms_sender(
         service_id, sms_sender, is_default=False, inbound_number_id=None
@@ -354,7 +354,7 @@ def mock_add_sms_sender(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_sms_sender(mocker):
     def _update_sms_sender(
         service_id, sms_sender_id, sms_sender=None, active=None, is_default=False
@@ -366,7 +366,7 @@ def mock_update_sms_sender(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def multiple_available_inbound_numbers(mocker):
     def _get():
         return {
@@ -406,7 +406,7 @@ def multiple_available_inbound_numbers(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def no_available_inbound_numbers(mocker):
     def _get():
         return {"data": []}
@@ -416,12 +416,12 @@ def no_available_inbound_numbers(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def fake_uuid():
     return sample_uuid()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service(mocker, api_user_active):
     def _get(service_id):
         service = service_json(
@@ -432,7 +432,7 @@ def mock_get_service(mocker, api_user_active):
     return mocker.patch("app.service_api_client.get_service", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_statistics(mocker, api_user_active):
     def _get(service_id, limit_days=None):
         return {
@@ -445,7 +445,7 @@ def mock_get_service_statistics(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_detailed_services(mocker, fake_uuid):
     service_one = service_json(
         id_=SERVICE_ONE_ID,
@@ -476,7 +476,7 @@ def mock_get_detailed_services(mocker, fake_uuid):
     return mocker.patch("app.service_api_client.get_services", return_value=services)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_live_service(mocker, api_user_active):
     def _get(service_id):
         service = service_json(
@@ -487,7 +487,7 @@ def mock_get_live_service(mocker, api_user_active):
     return mocker.patch("app.service_api_client.get_service", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_service(mocker):
     def _create(
         service_name,
@@ -510,7 +510,7 @@ def mock_create_service(mocker):
     return mocker.patch("app.service_api_client.create_service", side_effect=_create)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service(mocker):
     def _update(service_id, **kwargs):
         service = service_json(
@@ -538,7 +538,7 @@ def mock_update_service(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_raise_httperror_duplicate_name(mocker):
     def _update(service_id, **kwargs):
         json_mock = Mock(
@@ -563,7 +563,7 @@ TEMPLATE_ONE_ID = "b22d7d94-2197-4a7d-a8e7-fd5f9770bf48"
 USER_ONE_ID = "7b395b52-c6c1-469c-9d61-54166461c1ab"
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_services(mocker, active_user_with_permissions):
     def _get_services(params_dict=None):
         service_one = service_json(
@@ -589,7 +589,7 @@ def mock_get_services(mocker, active_user_with_permissions):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_services_with_no_services(mocker):
     def _get_services(params_dict=None):
         return {"data": []}
@@ -599,7 +599,7 @@ def mock_get_services_with_no_services(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_services_with_one_service(mocker, api_user_active):
     def _get_services(params_dict=None):
         return {
@@ -620,7 +620,7 @@ def mock_get_services_with_one_service(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_template(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -637,7 +637,7 @@ def mock_get_service_template(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_template_with_priority(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -655,7 +655,7 @@ def mock_get_service_template_with_priority(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_deleted_template(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -673,7 +673,7 @@ def mock_get_deleted_template(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_template_version(mocker, api_user_active):
     def _get(service_id, template_id, version):
         template_version = template_version_json(
@@ -684,7 +684,7 @@ def mock_get_template_version(mocker, api_user_active):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_template_versions(mocker, api_user_active):
     def _get(service_id, template_id):
         template_version = template_version_json(
@@ -697,7 +697,7 @@ def mock_get_template_versions(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_template_with_placeholders(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -712,7 +712,7 @@ def mock_get_service_template_with_placeholders(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_empty_service_template_with_optional_placeholder(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -726,7 +726,7 @@ def mock_get_empty_service_template_with_optional_placeholder(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_template_with_multiple_placeholders(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -741,7 +741,7 @@ def mock_get_service_template_with_multiple_placeholders(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_template_with_placeholders_same_as_recipient(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -756,7 +756,7 @@ def mock_get_service_template_with_placeholders_same_as_recipient(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_email_template(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -773,7 +773,7 @@ def mock_get_service_email_template(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_email_template_without_placeholders(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -790,7 +790,7 @@ def mock_get_service_email_template_without_placeholders(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_service_template(mocker, fake_uuid):
     def _create(
         name,
@@ -811,7 +811,7 @@ def mock_create_service_template(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_template(mocker):
     def _update(id_, name, type_, content, service, subject=None, process_type=None):
         template = template_json(
@@ -824,7 +824,7 @@ def mock_update_service_template(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_service_template_content_too_big(mocker):
     def _create(
         name,
@@ -861,7 +861,7 @@ def mock_create_service_template_content_too_big(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_template_400_content_too_big(mocker):
     def _update(id_, name, type_, content, service, subject=None, process_type=None):
         json_mock = Mock(
@@ -923,7 +923,7 @@ def _template(template_type, name, parent=None, template_id=None):
     }
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_templates(mocker):
     def _create(service_id):
         return create_service_templates(service_id)
@@ -933,7 +933,7 @@ def mock_get_service_templates(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_more_service_templates_than_can_fit_onscreen(mocker):
     def _create(service_id):
         return create_service_templates(service_id, number_of_templates=20)
@@ -943,7 +943,7 @@ def mock_get_more_service_templates_than_can_fit_onscreen(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_templates_when_no_templates_exist(mocker):
     def _create(service_id):
         return {"data": []}
@@ -953,7 +953,7 @@ def mock_get_service_templates_when_no_templates_exist(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_templates_with_only_one_template(mocker):
     def _get(service_id):
         return {
@@ -973,7 +973,7 @@ def mock_get_service_templates_with_only_one_template(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_delete_service_template(mocker):
     def _delete(service_id, template_id):
         template = template_json(
@@ -990,12 +990,12 @@ def mock_delete_service_template(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_redact_template(mocker):
     return mocker.patch("app.service_api_client.redact_service_template")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_template_sender(mocker):
     def _update(service_id, template_id, reply_to):
         return
@@ -1005,12 +1005,12 @@ def mock_update_service_template_sender(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_user_pending(fake_uuid):
     return create_user(id=fake_uuid, state="pending")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def platform_admin_user(fake_uuid):
     return create_platform_admin_user(
         permissions={
@@ -1027,7 +1027,7 @@ def platform_admin_user(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def platform_admin_user_no_service_permissions():
     """
     this fixture is for situations where we want to test that platform admin can access
@@ -1036,17 +1036,17 @@ def platform_admin_user_no_service_permissions():
     return create_platform_admin_user()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_user_active():
     return create_api_user_active()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_user_active_email_auth(fake_uuid):
     return create_user(id=fake_uuid, auth_type="email_auth")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def active_user_with_permissions_no_mobile(fake_uuid):
     return create_service_one_admin(
         id=fake_uuid,
@@ -1054,7 +1054,7 @@ def active_user_with_permissions_no_mobile(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_nongov_user_active(fake_uuid):
     return create_service_one_admin(
         id=fake_uuid,
@@ -1062,12 +1062,12 @@ def api_nongov_user_active(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def active_user_with_permissions(fake_uuid):
     return create_active_user_with_permissions()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def active_user_with_permission_to_two_services(fake_uuid):
     permissions = [
         "send_texts",
@@ -1090,7 +1090,7 @@ def active_user_with_permission_to_two_services(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def active_user_with_permission_to_other_service(
     active_user_with_permission_to_two_services,
 ):
@@ -1103,22 +1103,22 @@ def active_user_with_permission_to_other_service(
     return active_user_with_permission_to_two_services
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def active_caseworking_user():
     return create_active_caseworking_user()
 
 
-@pytest.fixture
+@pytest.fixture()
 def active_user_view_permissions():
     return create_active_user_view_permissions()
 
 
-@pytest.fixture
+@pytest.fixture()
 def active_user_no_settings_permission():
     return create_active_user_no_settings_permission()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_user_locked(fake_uuid):
     return create_user(
         id=fake_uuid,
@@ -1127,7 +1127,7 @@ def api_user_locked(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_user_request_password_reset(fake_uuid):
     return create_user(
         id=fake_uuid,
@@ -1135,7 +1135,7 @@ def api_user_request_password_reset(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def api_user_changed_password(fake_uuid):
     return create_user(
         id=fake_uuid,
@@ -1144,12 +1144,12 @@ def api_user_changed_password(fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_send_change_email_verification(mocker):
     return mocker.patch("app.user_api_client.send_change_email_verification")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_register_user(mocker, api_user_pending):
     def _register(name, email_address, mobile_number, password, auth_type):
         api_user_pending["name"] = name
@@ -1162,7 +1162,7 @@ def mock_register_user(mocker, api_user_pending):
     return mocker.patch("app.user_api_client.register_user", side_effect=_register)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_non_govuser(mocker, api_user_active):
     api_user_active["email_address"] = "someuser@example.com"
 
@@ -1173,7 +1173,7 @@ def mock_get_non_govuser(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user", side_effect=_get_user)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user(mocker, api_user_active):
     def _get_user(id_):
         api_user_active["id"] = id_
@@ -1182,7 +1182,7 @@ def mock_get_user(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user", side_effect=_get_user)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_locked_user(mocker, api_user_locked):
     def _get_user(id_):
         api_user_locked["id"] = id_
@@ -1191,12 +1191,12 @@ def mock_get_locked_user(mocker, api_user_locked):
     return mocker.patch("app.user_api_client.get_user", side_effect=_get_user)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_pending(mocker, api_user_pending):
     return mocker.patch("app.user_api_client.get_user", return_value=api_user_pending)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_by_email(mocker, api_user_active):
     def _get_user(email_address):
         api_user_active["email_address"] = email_address
@@ -1205,7 +1205,7 @@ def mock_get_user_by_email(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user_by_email", side_effect=_get_user)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_dont_get_user_by_email(mocker):
     def _get_user(email_address):
         return None
@@ -1215,7 +1215,7 @@ def mock_dont_get_user_by_email(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_by_email_request_password_reset(
     mocker, api_user_request_password_reset
 ):
@@ -1225,28 +1225,28 @@ def mock_get_user_by_email_request_password_reset(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_by_email_user_changed_password(mocker, api_user_changed_password):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_changed_password
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_by_email_locked(mocker, api_user_locked):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_locked
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_by_email_pending(mocker, api_user_pending):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_pending
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_user_by_email_not_found(mocker, api_user_active):
     def _get_user(email):
         json_mock = Mock(return_value={"message": "Not found", "result": "error"})
@@ -1257,7 +1257,7 @@ def mock_get_user_by_email_not_found(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user_by_email", side_effect=_get_user)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_verify_password(mocker):
     def _verify_password(user, password):
         return True
@@ -1267,7 +1267,7 @@ def mock_verify_password(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_user_password(mocker, api_user_active):
     def _update(user_id, password):
         api_user_active["id"] = user_id
@@ -1276,7 +1276,7 @@ def mock_update_user_password(mocker, api_user_active):
     return mocker.patch("app.user_api_client.update_password", side_effect=_update)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_user_attribute(mocker, api_user_active):
     def _update(user_id, **kwargs):
         api_user_active["id"] = user_id
@@ -1287,7 +1287,7 @@ def mock_update_user_attribute(mocker, api_user_active):
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_activate_user(mocker, api_user_active):
     def _activate(user_id):
         api_user_active["id"] = user_id
@@ -1296,14 +1296,14 @@ def mock_activate_user(mocker, api_user_active):
     return mocker.patch("app.user_api_client.activate_user", side_effect=_activate)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_email_is_not_already_in_use(mocker):
     return mocker.patch(
         "app.user_api_client.get_user_by_email_or_none", return_value=None
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_revoke_api_key(mocker):
     def _revoke(service_id, key_id):
         return {}
@@ -1311,7 +1311,7 @@ def mock_revoke_api_key(mocker):
     return mocker.patch("app.api_key_api_client.revoke_api_key", side_effect=_revoke)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_api_keys(mocker, fake_uuid):
     def _get_keys(service_id, key_id=None):
         keys = {
@@ -1332,7 +1332,7 @@ def mock_get_api_keys(mocker, fake_uuid):
     return mocker.patch("app.api_key_api_client.get_api_keys", side_effect=_get_keys)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_no_api_keys(mocker):
     def _get_keys(service_id):
         keys = {"apiKeys": []}
@@ -1341,7 +1341,7 @@ def mock_get_no_api_keys(mocker):
     return mocker.patch("app.api_key_api_client.get_api_keys", side_effect=_get_keys)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_login(mocker, mock_get_user, mock_update_user_attribute, mock_events):
     def _verify_code(user_id, code, code_type):
         return True, ""
@@ -1355,17 +1355,17 @@ def mock_login(mocker, mock_get_user, mock_update_user_attribute, mock_events):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_send_verify_code(mocker):
     return mocker.patch("app.user_api_client.send_verify_code")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_send_verify_email(mocker):
     return mocker.patch("app.user_api_client.send_verify_email")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_check_verify_code(mocker):
     def _verify(user_id, code, code_type):
         return True, ""
@@ -1373,7 +1373,7 @@ def mock_check_verify_code(mocker):
     return mocker.patch("app.user_api_client.check_verify_code", side_effect=_verify)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_check_verify_code_code_not_found(mocker):
     def _verify(user_id, code, code_type):
         return False, "Code not found"
@@ -1381,7 +1381,7 @@ def mock_check_verify_code_code_not_found(mocker):
     return mocker.patch("app.user_api_client.check_verify_code", side_effect=_verify)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_check_verify_code_code_expired(mocker):
     def _verify(user_id, code, code_type):
         return False, "Code has expired"
@@ -1389,7 +1389,7 @@ def mock_check_verify_code_code_expired(mocker):
     return mocker.patch("app.user_api_client.check_verify_code", side_effect=_verify)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_job(mocker, api_user_active):
     def _create(job_id, service_id, scheduled_for=None):
         return job_json(
@@ -1401,7 +1401,7 @@ def mock_create_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.create_job", side_effect=_create)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_job(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {"data": job_json(service_id, api_user_active, job_id=job_id)}
@@ -1409,7 +1409,7 @@ def mock_get_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_job_doesnt_exist(mocker):
     def _get_job(service_id, job_id):
         raise HTTPError(response=Mock(status_code=404, json={}), message={})
@@ -1417,7 +1417,7 @@ def mock_get_job_doesnt_exist(mocker):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_scheduled_job(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1433,7 +1433,7 @@ def mock_get_scheduled_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_cancelled_job(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1449,7 +1449,7 @@ def mock_get_cancelled_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_job_in_progress(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1466,7 +1466,7 @@ def mock_get_job_in_progress(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_job_with_sending_limits_exceeded(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1483,17 +1483,17 @@ def mock_get_job_with_sending_limits_exceeded(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_has_jobs(mocker):
     return mocker.patch("app.job_api_client.has_jobs", return_value=True)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_has_no_jobs(mocker):
     return mocker.patch("app.job_api_client.has_jobs", return_value=False)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_jobs(mocker, api_user_active, fake_uuid):
     def _get_jobs(service_id, limit_days=None, statuses=None, page=1):
         if statuses is None:
@@ -1549,7 +1549,7 @@ def mock_get_jobs(mocker, api_user_active, fake_uuid):
     return mocker.patch("app.job_api_client.get_jobs", side_effect=_get_jobs)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_scheduled_job_stats(mocker, api_user_active):
     return mocker.patch(
         "app.job_api_client.get_scheduled_job_stats",
@@ -1561,7 +1561,7 @@ def mock_get_scheduled_job_stats(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_uploads(mocker, api_user_active):
     def _get_uploads(service_id, limit_days=None, statuses=None, page=1):
         uploads = [
@@ -1593,8 +1593,8 @@ def mock_get_uploads(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
-def mock_get_no_uploads(mocker, api_user_active):
+@pytest.fixture()
+def _mock_get_no_uploads(mocker, api_user_active):
     mocker.patch(
         "app.models.job.PaginatedUploads.client_method",
         return_value={
@@ -1603,7 +1603,7 @@ def mock_get_no_uploads(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_no_jobs(mocker, api_user_active):
     return mocker.patch(
         "app.models.job.PaginatedJobs.client_method",
@@ -1614,7 +1614,7 @@ def mock_get_no_jobs(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_notifications(
     mocker,
     api_user_active,
@@ -1665,7 +1665,7 @@ def mock_get_notifications(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_notifications_with_previous_next(mocker):
     def _get_notifications(
         service_id,
@@ -1690,7 +1690,7 @@ def mock_get_notifications_with_previous_next(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_notifications_with_no_notifications(mocker):
     def _get_notifications(
         service_id,
@@ -1713,7 +1713,7 @@ def mock_get_notifications_with_no_notifications(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_inbound_sms(mocker):
     def _get_inbound_sms(service_id, user_number=None, page=1):
         return inbound_sms_json()
@@ -1724,7 +1724,7 @@ def mock_get_inbound_sms(mocker):
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_inbound_sms_by_id_with_no_messages(mocker):
     def _get_inbound_sms_by_id(service_id, notification_id):
         raise HTTPError(response=Mock(status_code=404))
@@ -1735,7 +1735,7 @@ def mock_get_inbound_sms_by_id_with_no_messages(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_most_recent_inbound_sms(mocker):
     def _get_most_recent_inbound_sms(service_id, user_number=None, page=1):
         return inbound_sms_json()
@@ -1746,7 +1746,7 @@ def mock_get_most_recent_inbound_sms(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_most_recent_inbound_sms_with_no_messages(mocker):
     def _get_most_recent_inbound_sms(service_id, user_number=None, page=1):
         return {"has_next": False, "data": []}
@@ -1757,7 +1757,7 @@ def mock_get_most_recent_inbound_sms_with_no_messages(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_inbound_sms_summary(mocker):
     def _get_inbound_sms_summary(
         service_id,
@@ -1770,7 +1770,7 @@ def mock_get_inbound_sms_summary(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_inbound_sms_summary_with_no_messages(mocker):
     def _get_inbound_sms_summary(
         service_id,
@@ -1783,7 +1783,7 @@ def mock_get_inbound_sms_summary_with_no_messages(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_inbound_number_for_service(mocker):
     return mocker.patch(
         "app.inbound_number_client.get_inbound_sms_number_for_service",
@@ -1791,7 +1791,7 @@ def mock_get_inbound_number_for_service(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_no_inbound_number_for_service(mocker):
     return mocker.patch(
         "app.inbound_number_client.get_inbound_sms_number_for_service",
@@ -1799,7 +1799,7 @@ def mock_no_inbound_number_for_service(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_has_permissions(mocker):
     def _has_permission(*permissions, restrict_admin_usage=False, allow_org_user=False):
         return True
@@ -1809,7 +1809,7 @@ def mock_has_permissions(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_users_by_service(mocker):
     def _get_users_for_service(service_id):
         return [
@@ -1828,7 +1828,7 @@ def mock_get_users_by_service(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_s3_upload(mocker):
     def _upload(service_id, filedata):
         return sample_uuid()
@@ -1836,7 +1836,7 @@ def mock_s3_upload(mocker):
     return mocker.patch("app.main.views.send.s3upload", side_effect=_upload)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_s3_download(mocker):
     def _download(service_id, upload_id):
         return """
@@ -1848,7 +1848,7 @@ def mock_s3_download(mocker):
     return mocker.patch("app.main.views.send.s3download", side_effect=_download)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_s3_get_metadata(mocker):
     def _get_metadata(service_id, upload_id):
         return {"original_file_name": "example.csv"}
@@ -1858,12 +1858,12 @@ def mock_s3_get_metadata(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_s3_set_metadata(mocker):
     return mocker.patch("app.main.views.send.set_metadata_on_csv_upload")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def sample_invite(mocker, service_one):
     id_ = USER_ONE_ID
     from_user = service_one["users"][0]
@@ -1887,7 +1887,7 @@ def sample_invite(mocker, service_one):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_invite(mocker, sample_invite):
     def _create_invite(
         from_user, service_id, email_address, permissions, folder_permissions
@@ -1905,7 +1905,7 @@ def mock_create_invite(mocker, sample_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_invites_for_service(mocker, service_one, sample_invite):
     def _get_invites(service_id):
         data = []
@@ -1920,7 +1920,7 @@ def mock_get_invites_for_service(mocker, service_one, sample_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_invites_without_manage_permission(mocker, service_one, sample_invite):
     def _get_invites(service_id):
         return [
@@ -1942,7 +1942,7 @@ def mock_get_invites_without_manage_permission(mocker, service_one, sample_invit
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_accept_invite(mocker, sample_invite):
     def _accept(service_id, invite_id):
         return sample_invite
@@ -1950,7 +1950,7 @@ def mock_accept_invite(mocker, sample_invite):
     return mocker.patch("app.invite_api_client.accept_invite", side_effect=_accept)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_add_user_to_service(mocker, service_one, api_user_active):
     def _add_user(service_id, user_id, permissions, folder_permissions):
         return
@@ -1960,19 +1960,19 @@ def mock_add_user_to_service(mocker, service_one, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_set_user_permissions(mocker):
     return mocker.patch("app.user_api_client.set_user_permissions", return_value=None)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_remove_user_from_service(mocker):
     return mocker.patch(
         "app.service_api_client.remove_user_from_service", return_value=None
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_template_statistics(mocker, service_one, fake_uuid):
     template = template_json(
         service_one["id"],
@@ -1998,7 +1998,7 @@ def mock_get_template_statistics(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_monthly_template_usage(mocker, service_one, fake_uuid):
     def _stats(service_id, year):
         return [
@@ -2018,7 +2018,7 @@ def mock_get_monthly_template_usage(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_monthly_notification_stats(mocker, service_one, fake_uuid):
     def _stats(service_id, year):
         return {
@@ -2041,7 +2041,7 @@ def mock_get_monthly_notification_stats(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_annual_usage_for_service(mocker, service_one, fake_uuid):
     def _get_usage(service_id, year=None):
         return [
@@ -2076,7 +2076,7 @@ def mock_get_annual_usage_for_service(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_monthly_usage_for_service(mocker):
     def _get_usage(service_id, year):
         return [
@@ -2127,7 +2127,7 @@ def mock_get_monthly_usage_for_service(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_annual_usage_for_service_in_future(mocker, service_one, fake_uuid):
     def _get_usage(service_id, year=None):
         return [
@@ -2154,7 +2154,7 @@ def mock_get_annual_usage_for_service_in_future(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_monthly_usage_for_service_in_future(mocker):
     def _get_usage(service_id, year):
         return []
@@ -2164,7 +2164,7 @@ def mock_get_monthly_usage_for_service_in_future(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_events(mocker):
     def _create_event(event_type, event_data):
         return {"some": "data"}
@@ -2172,7 +2172,7 @@ def mock_events(mocker):
     return mocker.patch("app.events_api_client.create_event", side_effect=_create_event)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_send_already_registered_email(mocker):
     return mocker.patch("app.user_api_client.send_already_registered_email")
 
@@ -2201,7 +2201,7 @@ def create_email_brandings(
     return brandings
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_all_email_branding(mocker):
     def _get_all_email_branding(sort_key=None):
         non_standard_values = [
@@ -2221,7 +2221,7 @@ def mock_get_all_email_branding(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_no_email_branding(mocker):
     def _get_email_branding():
         return []
@@ -2248,7 +2248,7 @@ def create_email_branding(id, non_standard_values=None):
     return {"email_branding": branding}
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_email_branding(mocker, fake_uuid):
     def _get_email_branding(id):
         return create_email_branding(fake_uuid)
@@ -2258,7 +2258,7 @@ def mock_get_email_branding(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_email_branding_with_govuk_brand_type(mocker, fake_uuid):
     def _get_email_branding(id):
         return create_email_branding(fake_uuid, {"brand_type": "govuk"})
@@ -2268,7 +2268,7 @@ def mock_get_email_branding_with_govuk_brand_type(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_email_branding_with_both_brand_type(mocker, fake_uuid):
     def _get_email_branding(id):
         return create_email_branding(fake_uuid, {"brand_type": "both"})
@@ -2278,7 +2278,7 @@ def mock_get_email_branding_with_both_brand_type(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_email_branding_with_org_banner_brand_type(mocker, fake_uuid):
     def _get_email_branding(id):
         return create_email_branding(fake_uuid, {"brand_type": "org_banner"})
@@ -2288,7 +2288,7 @@ def mock_get_email_branding_with_org_banner_brand_type(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_email_branding_without_brand_text(mocker, fake_uuid):
     def _get_email_branding_without_brand_text(id):
         return create_email_branding(
@@ -2301,7 +2301,7 @@ def mock_get_email_branding_without_brand_text(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_email_branding(mocker):
     def _create_email_branding(logo, name, text, colour, brand_type):
         return
@@ -2312,7 +2312,7 @@ def mock_create_email_branding(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_email_branding(mocker):
     def _update_email_branding(branding_id, logo, name, text, colour, brand_type):
         return
@@ -2323,7 +2323,7 @@ def mock_update_email_branding(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_guest_list(mocker):
     def _get_guest_list(service_id):
         return {
@@ -2336,17 +2336,17 @@ def mock_get_guest_list(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_guest_list(mocker):
     return mocker.patch("app.service_api_client.update_guest_list")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_reset_failed_login_count(mocker):
     return mocker.patch("app.user_api_client.reset_failed_login_count")
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_notification(mocker):
     def _get_notification(
         service_id,
@@ -2377,7 +2377,7 @@ def mock_get_notification(mocker):
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_send_notification(mocker, fake_uuid):
     def _send_notification(
         service_id, *, template_id, recipient, personalisation, sender_id
@@ -2389,8 +2389,8 @@ def mock_send_notification(mocker, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
-def _client(notify_admin):
+@pytest.fixture()
+def client(notify_admin):
     """
     Do not use this fixture directly – use `client_request` instead
     """
@@ -2399,19 +2399,19 @@ def _client(notify_admin):
         yield client
 
 
-@pytest.fixture(scope="function")
-def _logged_in_client(
-    _client, active_user_with_permissions, mocker, service_one, mock_login
+@pytest.fixture()
+def logged_in_client(
+    client, active_user_with_permissions, mocker, service_one, mock_login
 ):
     """
     Do not use this fixture directly – use `client_request` instead
     """
-    _client.login(active_user_with_permissions, mocker, service_one)
-    yield _client
+    client.login(active_user_with_permissions, mocker, service_one)
+    return client
 
 
-@pytest.fixture
-def os_environ():
+@pytest.fixture()
+def _os_environ():
     """
     clear os.environ, and restore it after the test runs
     """
@@ -2424,21 +2424,21 @@ def os_environ():
 
 
 @pytest.fixture  # noqa (C901 too complex)
-def client_request(_logged_in_client, mocker, service_one):  # noqa (C901 too complex)
+def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too complex)
     class ClientRequest:
         @staticmethod
         @contextmanager
         def session_transaction():
-            with _logged_in_client.session_transaction() as session:
+            with logged_in_client.session_transaction() as session:
                 yield session
 
         @staticmethod
         def login(user, service=service_one):
-            _logged_in_client.login(user, mocker, service)
+            logged_in_client.login(user, mocker, service)
 
         @staticmethod
         def logout():
-            _logged_in_client.logout(None)
+            logged_in_client.logout(None)
 
         @staticmethod
         def get(
@@ -2470,7 +2470,7 @@ def client_request(_logged_in_client, mocker, service_one):  # noqa (C901 too co
             _test_for_elements_without_class=True,
             **endpoint_kwargs
         ):
-            resp = _logged_in_client.get(
+            resp = logged_in_client.get(
                 url,
                 follow_redirects=_follow_redirects,
             )
@@ -2535,7 +2535,7 @@ def client_request(_logged_in_client, mocker, service_one):  # noqa (C901 too co
             post_kwargs = {}
             if _content_type:
                 post_kwargs.update(content_type=_content_type)
-            resp = _logged_in_client.post(
+            resp = logged_in_client.post(
                 url, data=_data, follow_redirects=_follow_redirects, **post_kwargs
             )
             assert resp.status_code == _expected_status
@@ -2558,7 +2558,7 @@ def client_request(_logged_in_client, mocker, service_one):  # noqa (C901 too co
             url,
             _expected_status=200,
         ):
-            resp = _logged_in_client.get(url)
+            resp = logged_in_client.get(url)
             assert resp.status_code == _expected_status
             return resp
 
@@ -2588,7 +2588,7 @@ def client_request(_logged_in_client, mocker, service_one):  # noqa (C901 too co
             post_kwargs = {}
             if _content_type:
                 post_kwargs.update(content_type=_content_type)
-            resp = _logged_in_client.post(url, data=_data, **post_kwargs)
+            resp = logged_in_client.post(url, data=_data, **post_kwargs)
             assert resp.status_code == _expected_status
             return resp
 
@@ -2601,7 +2601,7 @@ def normalize_spaces(input):
     return normalize_spaces(" ".join(item.text for item in input))
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_data_retention(mocker):
     data = {
         "id": str(sample_uuid()),
@@ -2617,17 +2617,17 @@ def mock_get_service_data_retention(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_service_data_retention(mocker):
     return mocker.patch("app.service_api_client.create_service_data_retention")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_data_retention(mocker):
     return mocker.patch("app.service_api_client.update_service_data_retention")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_free_sms_fragment_limit(mocker):
     sample_limit = 250000
     return mocker.patch(
@@ -2636,7 +2636,7 @@ def mock_get_free_sms_fragment_limit(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_or_update_free_sms_fragment_limit(mocker):
     sample_limit = 250000
     return mocker.patch(
@@ -2667,7 +2667,7 @@ def set_config_values(app, dict):
         app.config[key] = old_values[key]
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def valid_token(notify_admin, fake_uuid):
     return generate_token(
         json.dumps({"user_id": fake_uuid, "secret_code": "my secret"}),
@@ -2676,7 +2676,7 @@ def valid_token(notify_admin, fake_uuid):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_valid_service_inbound_api(mocker):
     def _get(service_id, inbound_api_id):
         return {
@@ -2693,7 +2693,7 @@ def mock_get_valid_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_valid_service_callback_api(mocker):
     def _get(service_id, callback_api_id):
         return {
@@ -2710,7 +2710,7 @@ def mock_get_valid_service_callback_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_empty_service_inbound_api(mocker):
     return mocker.patch(
         "app.service_api_client.get_service_inbound_api",
@@ -2718,7 +2718,7 @@ def mock_get_empty_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_empty_service_callback_api(mocker):
     return mocker.patch(
         "app.service_api_client.get_service_callback_api",
@@ -2726,7 +2726,7 @@ def mock_get_empty_service_callback_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_service_inbound_api(mocker):
     def _create_service_inbound_api(service_id, url, bearer_token, user_id):
         return
@@ -2737,7 +2737,7 @@ def mock_create_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_inbound_api(mocker):
     def _update_service_inbound_api(
         service_id, url, bearer_token, user_id, inbound_api_id
@@ -2750,7 +2750,7 @@ def mock_update_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_create_service_callback_api(mocker):
     def _create_service_callback_api(service_id, url, bearer_token, user_id):
         return
@@ -2761,7 +2761,7 @@ def mock_create_service_callback_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_callback_api(mocker):
     def _update_service_callback_api(
         service_id, url, bearer_token, user_id, callback_api_id
@@ -2774,14 +2774,14 @@ def mock_update_service_callback_api(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def organization_one(api_user_active):
     return organization_json(
         ORGANISATION_ID, "organization one", [api_user_active["id"]]
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_organizations(mocker):
     def _get_organizations():
         return [
@@ -2801,7 +2801,7 @@ def mock_get_organizations(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_organizations_with_unusual_domains(mocker):
     def _get_organizations():
         return [
@@ -2822,7 +2822,7 @@ def mock_get_organizations_with_unusual_domains(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_organization(mocker):
     def _get_organization(org_id):
         return organization_json(
@@ -2839,7 +2839,7 @@ def mock_get_organization(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_organization_by_domain(mocker):
     def _get_organization_by_domain(domain):
         return organization_json(ORGANISATION_ID)
@@ -2850,7 +2850,7 @@ def mock_get_organization_by_domain(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_no_organization_by_domain(mocker):
     return mocker.patch(
         "app.organizations_client.get_organization_by_domain",
@@ -2858,7 +2858,7 @@ def mock_get_no_organization_by_domain(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_organization(
     mocker,
     mock_get_organization,
@@ -2870,7 +2870,7 @@ def mock_get_service_organization(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_service_organization(mocker):
     def _update_service_organization(service_id, org_id):
         return
@@ -2901,7 +2901,7 @@ def _get_organization_services(organization_id):
     ]
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_organization_services(mocker, api_user_active):
     return mocker.patch(
         "app.organizations_client.get_organization_services",
@@ -2909,7 +2909,7 @@ def mock_get_organization_services(mocker, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_users_for_organization(mocker):
     def _get_users_for_organization(org_id):
         return [
@@ -2923,7 +2923,7 @@ def mock_get_users_for_organization(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_invited_users_for_organization(mocker, sample_org_invite):
     def _get_invited_invited_users_for_organization(org_id):
         return [sample_org_invite]
@@ -2934,7 +2934,7 @@ def mock_get_invited_users_for_organization(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def sample_org_invite(mocker, organization_one):
     id_ = str(UUID(bytes=b"sample_org_invit", version=4))
     invited_by = organization_one["users"][0]
@@ -2948,7 +2948,7 @@ def sample_org_invite(mocker, organization_one):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_invites_for_organization(mocker, sample_org_invite):
     def _get_org_invites(org_id):
         data = []
@@ -2964,7 +2964,7 @@ def mock_get_invites_for_organization(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_check_org_invite_token(mocker, sample_org_invite):
     def _check_org_token(token):
         return sample_org_invite
@@ -2974,7 +2974,7 @@ def mock_check_org_invite_token(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_check_org_cancelled_invite_token(mocker, sample_org_invite):
     def _check_org_token(token):
         sample_org_invite["status"] = "cancelled"
@@ -2985,7 +2985,7 @@ def mock_check_org_cancelled_invite_token(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_check_org_accepted_invite_token(mocker, sample_org_invite):
     sample_org_invite["status"] = "accepted"
 
@@ -2997,7 +2997,7 @@ def mock_check_org_accepted_invite_token(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_accept_org_invite(mocker, sample_org_invite):
     def _accept(organization_id, invite_id):
         return sample_org_invite
@@ -3005,7 +3005,7 @@ def mock_accept_org_invite(mocker, sample_org_invite):
     return mocker.patch("app.org_invite_api_client.accept_invite", side_effect=_accept)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_add_user_to_organization(mocker, organization_one, api_user_active):
     def _add_user(organization_id, user_id):
         return api_user_active
@@ -3015,7 +3015,7 @@ def mock_add_user_to_organization(mocker, organization_one, api_user_active):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_update_organization(mocker):
     def _update_org(org, **kwargs):
         return
@@ -3025,7 +3025,7 @@ def mock_update_organization(mocker):
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_organizations_and_services_for_user(
     mocker, organization_one, api_user_active
 ):
@@ -3038,7 +3038,7 @@ def mock_get_organizations_and_services_for_user(
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_non_empty_organizations_and_services_for_user(
     mocker, organization_one, api_user_active
 ):
@@ -3085,7 +3085,7 @@ def mock_get_non_empty_organizations_and_services_for_user(
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_just_services_for_user(mocker, organization_one, api_user_active):
     def _make_services(name, trial_mode=False):
         return [
@@ -3110,7 +3110,7 @@ def mock_get_just_services_for_user(mocker, organization_one, api_user_active):
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_empty_organizations_and_one_service_for_user(
     mocker, organization_one, api_user_active
 ):
@@ -3132,7 +3132,7 @@ def mock_get_empty_organizations_and_one_service_for_user(
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_create_event(mocker):
     """
     This should be used whenever your code is calling `flask_login.login_user`
@@ -3149,19 +3149,19 @@ def url_for_endpoint_with_token(endpoint, token, next=None):
     return url_for(endpoint, token=token, next=next)
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_template_folders(mocker):
     return mocker.patch(
         "app.template_folder_api_client.get_template_folders", return_value=[]
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_move_to_template_folder(mocker):
     return mocker.patch("app.template_folder_api_client.move_to_folder")
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_create_template_folder(mocker):
     return mocker.patch(
         "app.template_folder_api_client.create_template_folder",
@@ -3169,7 +3169,7 @@ def mock_create_template_folder(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_and_organization_counts(mocker):
     return mocker.patch(
         "app.status_api_client.get_count_of_live_services_and_organizations",
@@ -3180,7 +3180,7 @@ def mock_get_service_and_organization_counts(mocker):
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_get_service_history(mocker):
     return mocker.patch(
         "app.service_api_client.get_service_history",
@@ -3578,7 +3578,7 @@ def create_template(
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_invited_user_by_id(mocker, sample_invite):
     def _get(invited_user_id):
         return sample_invite
@@ -3589,7 +3589,7 @@ def mock_get_invited_user_by_id(mocker, sample_invite):
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def mock_get_invited_org_user_by_id(mocker, sample_org_invite):
     def _get(invited_org_user_id):
         return sample_org_invite
@@ -3666,7 +3666,7 @@ def login_for_end_to_end_testing(browser):
 @pytest.fixture(scope="session")
 def end_to_end_context(browser):
     context = browser.new_context()
-    yield context
+    return context
 
 
 @pytest.fixture(scope="session")
@@ -3680,4 +3680,4 @@ def end_to_end_authenticated_context(browser):
     )
     context = browser.new_context(storage_state=auth_state_path)
 
-    yield context
+    return context