Don't reuse sanitised service and orgs

Author: corlettb

app/functional_tests_fixtures/__init__.py

@@ -392,9 +392,10 @@ def _create_user(name, email_address, password, auth_type="sms_auth", organisati
 def _create_organiation(email_domain, org_name):
     organisations = dao_get_organisations_by_partial_name(org_name)
 
+    # skip redacted org
     org = None
     for organisation in organisations:
-        if organisation.name == org_name:
+        if organisation.name == org_name and organisation.notes != "redacted":
             org = organisation
 
     if org is None:
@@ -412,7 +413,7 @@ def _create_service(org_id, user, service_name="Functional Tests"):
 
     service = None
     for s in services:
-        if s.name == service_name and s.contact_link == current_app.config["ADMIN_BASE_URL"]:
+        if s.name == service_name and s.notes != "redacted":
             service = s
 
     if service is None: