diff --git a/local/testing/api-tests/irs-api-tests.tavern.yaml b/local/testing/api-tests/irs-api-tests.tavern.yaml
index f4f28cf64a..fd6dd13ec9 100644
--- a/local/testing/api-tests/irs-api-tests.tavern.yaml
+++ b/local/testing/api-tests/irs-api-tests.tavern.yaml
@@ -67,7 +67,7 @@ stages:
 
   - &verify_ESS_job_response_with_desired_test_steps_and_wait_up_to_15_minutes_for_COMPLETED
     name: verify job response with desired test steps and wait for desired job status
-    max_retries: 30
+    max_retries: 180
     request:
       url: "{tavern.env_vars.IRS_ESS_HOST}/ess/bpn/investigations/{job_id}"
       params:
@@ -82,7 +82,7 @@ stages:
       json:
         job:
           state: COMPLETED
-    delay_after: 30
+    delay_after: 5
 
   - name: get response for created investigation
     request:
@@ -448,9 +448,12 @@ stages:
         - function: local.testing.api-tests.tavern_helpers:supplyChainImpacted_is_as_expected
           extra_kwargs:
             expectedSupplyChainImpacted: "Unknown"
-        - function: local.testing.api-tests.tavern_helpers:tombstone_for_EssValidation_are_correct
+        - function: local.testing.api-tests.tavern_helpers:tombstones_have_size
+          extra_kwargs:
+            number_of_tombstones: 1
+        - function: local.testing.api-tests.tavern_helpers:tombstone_for_ess_validation_is_correct
           extra_kwargs:
-            expectedTombstone: "AspectType 'PartSiteInformationAsPlanned' not found in Job."
+            expected_error_detail: "AspectType 'PartSiteInformationAsPlanned' not found in Job."
       headers:
         content-type: application/json
 
@@ -512,7 +515,7 @@ stages:
             number_of_tombstones: 2
         - function: local.testing.api-tests.tavern_helpers:tombstone_for_submodel_validation_is_correct
           extra_kwargs:
-            expected_error_detail: "Submodel payload validation failed. $.sites[0]: required property 'catenaXsiteId' not found."
+            expected_error_detail: "Submodel payload validation failed. $.sites[0]: required property 'catenaXsiteId' not found"
         - function: local.testing.api-tests.tavern_helpers:tombstone_for_ess_validation_is_correct
           extra_kwargs:
             expected_error_detail: "AspectType 'PartSiteInformationAsPlanned' not found in Job."
@@ -1137,7 +1140,7 @@ stages:
 
   - &verify_job_is_running_and_wait_up_to_15_minutes_for_COMPLETED
     name: verify job is running and wait for desired job status
-    max_retries: 30
+    max_retries: 180
     request:
       url: "{tavern.env_vars.IRS_HOST}/irs/jobs/{job_id}"
       params:
@@ -1152,7 +1155,7 @@ stages:
       json:
         job:
           state: COMPLETED
-    delay_after: 30
+    delay_after: 5
 
   - name: verify job response with desired test steps
     request: