diff --git a/tests/cases/test_pdb_health.tavern.yaml b/tests/cases/test_pdb_health.tavern.yaml
index 5bdf2998b337a67fad882d7636b39d88db49ee19..2d2ca4896c6ae925b69320adc5626fcc8768f95f 100755
--- a/tests/cases/test_pdb_health.tavern.yaml
+++ b/tests/cases/test_pdb_health.tavern.yaml
@@ -27,7 +27,7 @@ stages:
 
   # - name: Make sure binding sites calls for an invalid UniProt accession errors out
   #   request:
-  #     url: "{host}/pdb/binding_sites_uniprot/P00000"
+  #     url: "{host}/pdb/binding_sites_uniprot/{invalid_uniprot_accession}"
   #     method: GET
   #   response:
   #     status_code: 404
diff --git a/tests/cases/test_sifts_health.tavern.yaml b/tests/cases/test_sifts_health.tavern.yaml
index f64b051b64f4d7761010a7f2f378899b79223e55..c7106e70d9ff28872e0b45740989556a38ca5be0 100755
--- a/tests/cases/test_sifts_health.tavern.yaml
+++ b/tests/cases/test_sifts_health.tavern.yaml
@@ -140,7 +140,7 @@ stages:
 
   - name: Make sure best structures calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/mappings/best_structures/P00000"
+      url: "{host}/mappings/best_structures/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -154,7 +154,7 @@ stages:
 
   - name: Make sure best structures calls for an invalid UniProt residue range errors out
     request:
-      url: "{host}/mappings/best_structures/P00000/1/10"
+      url: "{host}/mappings/best_structures/{invalid_uniprot_accession}/1/10"
       method: GET
     response:
       status_code: 404
@@ -253,7 +253,7 @@ stages:
 
   - name: Make sure uniprot to pfam mapping calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/mappings/uniprot_to_pfam/P00000"
+      url: "{host}/mappings/uniprot_to_pfam/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
diff --git a/tests/cases/test_uniprot_health.tavern.yaml b/tests/cases/test_uniprot_health.tavern.yaml
index 1b45327d32941ee758d72812e721db2a555d18d5..1595cff57ec9d72dac1c77de6396c62cf671b39c 100755
--- a/tests/cases/test_uniprot_health.tavern.yaml
+++ b/tests/cases/test_uniprot_health.tavern.yaml
@@ -13,7 +13,7 @@ stages:
 
   - name: Make sure mappings calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/P00000"
+      url: "{host}/uniprot/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -27,7 +27,7 @@ stages:
 
   - name: Make sure mappings calls for an invalid UniProt residue errors out
     request:
-      url: "{host}/uniprot/P00000/10"
+      url: "{host}/uniprot/{invalid_uniprot_accession}/10"
       method: GET
     response:
       status_code: 404
@@ -41,7 +41,7 @@ stages:
 
   - name: Make sure protvista unipdb calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/protvista/unipdb/P00000"
+      url: "{host}/uniprot/protvista/unipdb/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -55,7 +55,7 @@ stages:
 
   - name: Make sure domains calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/domains/P00000"
+      url: "{host}/uniprot/domains/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -69,7 +69,7 @@ stages:
 
   - name: Make sure secondary structures calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/secondary_structures/P00000"
+      url: "{host}/uniprot/secondary_structures/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -83,7 +83,7 @@ stages:
 
   - name: Make sure interaction partners calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/interaction_partners/P00000"
+      url: "{host}/uniprot/interaction_partners/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -97,7 +97,7 @@ stages:
 
   - name: Make sure ligands calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/ligands/P00000"
+      url: "{host}/uniprot/ligands/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -111,7 +111,7 @@ stages:
 
   - name: Make sure best non overlapping structures calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/best_non_overlapping_structures/P00000"
+      url: "{host}/uniprot/best_non_overlapping_structures/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -125,7 +125,7 @@ stages:
 
   - name: Make sure summary stats calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/summary_stats/P00000"
+      url: "{host}/uniprot/summary_stats/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -139,7 +139,7 @@ stages:
 
   - name: Make sure similar proteins calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/similar_proteins/P00000"
+      url: "{host}/uniprot/similar_proteins/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -153,7 +153,7 @@ stages:
 
   - name: Make sure sequence conservation calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/sequence_conservation/P00000"
+      url: "{host}/uniprot/sequence_conservation/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -167,7 +167,7 @@ stages:
 
   - name: Make sure generic interface residues calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/interface_residues/P00000"
+      url: "{host}/uniprot/interface_residues/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -181,7 +181,7 @@ stages:
 
   - name: Make sure generic ligand binding residues calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/ligand_sites/P00000"
+      url: "{host}/uniprot/ligand_sites/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -195,7 +195,7 @@ stages:
 
   - name: Make sure variation calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/variation/P00000"
+      url: "{host}/uniprot/variation/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
@@ -209,7 +209,35 @@ stages:
 
   - name: Make sure similar identical proteins calls for an invalid UniProt accession errors out
     request:
-      url: "{host}/uniprot/similar_proteins/P00000/85"
+      url: "{host}/uniprot/similar_proteins/{invalid_uniprot_accession}/85"
+      method: GET
+    response:
+      status_code: 404
+
+  # - name: Make sure superposition calls for a valid UniProt accession does not errors out
+  #   request:
+  #     url: "{host}/uniprot/superposition/P07550"
+  #     method: GET
+  #   response:
+  #     status_code: 200
+
+  # - name: Make sure superposition calls for an invalid UniProt accession errors out
+  #   request:
+  #     url: "{host}/uniprot/superposition/{invalid_uniprot_accession}"
+  #     method: GET
+  #   response:
+  #     status_code: 404
+
+  - name: Make sure processed proteins calls for a valid UniProt accession does not errors out
+    request:
+      url: "{host}/uniprot/processed_proteins/P0DTD1"
+      method: GET
+    response:
+      status_code: 200
+
+  - name: Make sure processed proteins calls for an invalid UniProt accession errors out
+    request:
+      url: "{host}/uniprot/processed_proteins/{invalid_uniprot_accession}"
       method: GET
     response:
       status_code: 404
\ No newline at end of file
diff --git a/tests/common.yaml b/tests/common.yaml
index be732799a9b3b0b8c34e681eb365aaa9ff15b803..0a8315cd8717fb1da6d8d1e85bdb47554010c539 100755
--- a/tests/common.yaml
+++ b/tests/common.yaml
@@ -8,4 +8,5 @@ variables:
   host: "{tavern.env_vars.HOST}"
   invalid_pdb_entry: "1x00"
   invalid_hetcode: "ZZZZ"
-  invalid_pdb_entity: "1x00/0"
\ No newline at end of file
+  invalid_pdb_entity: "1x00/0"
+  invalid_uniprot_accession: "INVALIDPROTEIN"
diff --git a/tests/pepvep_invalid_json.yaml b/tests/pepvep_invalid_json.yaml
index fbac8dcb9bb250bec03947b507ccc023bda43fbc..1a9b3feed61787be5794fc8493a8d32b350d35d1 100644
--- a/tests/pepvep_invalid_json.yaml
+++ b/tests/pepvep_invalid_json.yaml
@@ -1,5 +1,5 @@
 [{
-  "accession": "P00000",
+  "accession": "INVALIDPROTEIN",
   "positions": ["16", "17", "20", "100"]
 },
 {