From 95d7921d31119ab69853682eed3699500efe21ef Mon Sep 17 00:00:00 2001
From: mfallonhmcts <114912573+mfallonhmcts@users.noreply.github.com>
Date: Mon, 3 Jun 2024 14:10:08 +0100
Subject: [PATCH] DTSCCI-297 - Categorising API Tests (#4400)

* categorising api tests

* categorising spec tests

* updating unspec full defence tag

* updating test categories again

* updating tests

* updating more tests

* Update package.json

* Update package.json

* Changing r2 sdo command

* Update api_request_for_reconsideration_test.js

* Update api_noise_induced_hearing_loss_test.js

* Update api_dispute_resolution_hearing_test.js

* Update sdo_flight_delay_test.js

* Update package.json

* Update api_1v1_test.js

* Update package.json

* Update api_transfer_online_case_test.js
---
 .../damages/api_1v2_different_solicitor_test.js        |  3 ++-
 .../api_tests/damages/api_1v2_same_solicitor_test.js   |  2 +-
 e2e/tests/api_tests/damages/api_2v1_test.js            |  2 +-
 e2e/tests/api_tests/lrspec/api_1v1_spec_test.js        |  9 +++++----
 e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js   |  8 ++++----
 e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js   |  8 ++++----
 e2e/tests/api_tests/lrspec/api_2v1_spec_test.js        | 10 +++++-----
 .../api_tests/sdo/api_transfer_online_case_test.js     |  6 +++---
 e2e/tests/api_tests/sdo/sdo_test.js                    |  2 +-
 .../sdo_R2/api_dispute_resolution_hearing_test.js      |  2 +-
 .../sdo_R2/api_noise_induced_hearing_loss_test.js      |  2 +-
 .../sdo_R2/api_request_for_reconsideration_test.js     |  2 +-
 e2e/tests/api_tests/sdo_R2/sdo_flight_delay_test.js    |  5 +++--
 package.json                                           |  9 ++++++++-
 14 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js b/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js
index f2a5f1f9a6..3692f94f36 100644
--- a/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js
+++ b/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js
@@ -4,7 +4,8 @@ const config = require('../../../config.js');
 const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP';
 
 // add @api-tests to run
-Feature('CCD 1v2 Different Solicitor API test @api-unspec @api-multiparty @api-tests-1v2DS @api-nightly-prod');
+
+Feature('CCD 1v2 Different Solicitor API test @api-unspec @api-multiparty @api-tests-1v2DS @api-nightly-prod @api-unspec-full-defence');
 
 Scenario('Create claim', async ({I, api}) => {
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
diff --git a/e2e/tests/api_tests/damages/api_1v2_same_solicitor_test.js b/e2e/tests/api_tests/damages/api_1v2_same_solicitor_test.js
index 7f3be3110e..1fffc41d77 100644
--- a/e2e/tests/api_tests/damages/api_1v2_same_solicitor_test.js
+++ b/e2e/tests/api_tests/damages/api_1v2_same_solicitor_test.js
@@ -4,7 +4,7 @@ const config = require('../../../config.js');
 const mpScenario = 'ONE_V_TWO_ONE_LEGAL_REP';
 
 
-Feature('CCD 1v2 Same Solicitor API test @api-unspec @api-tests-1v2SS @api-nightly-prod');
+Feature('CCD 1v2 Same Solicitor API test @api-unspec @api-tests-1v2SS @api-nightly-prod @api-unspec-full-defence');
 
 Scenario('Create claim', async ({I, api}) => {
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
diff --git a/e2e/tests/api_tests/damages/api_2v1_test.js b/e2e/tests/api_tests/damages/api_2v1_test.js
index c99ac6e20d..222f18a6c5 100644
--- a/e2e/tests/api_tests/damages/api_2v1_test.js
+++ b/e2e/tests/api_tests/damages/api_2v1_test.js
@@ -3,7 +3,7 @@
 const config = require('../../../config.js');
 const mpScenario = 'TWO_V_ONE';
 
-Feature('CCD 2v1 API test @api-unspec @api-multiparty @api-tests-2v1 @api-prod @api-nightly-prod');
+Feature('CCD 2v1 API test @api-unspec @api-multiparty @api-tests-2v1 @api-prod @api-nightly-prod @api-unspec-full-defence');
 
 Scenario('Create claim', async ({I, api}) => {
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
diff --git a/e2e/tests/api_tests/lrspec/api_1v1_spec_test.js b/e2e/tests/api_tests/lrspec/api_1v1_spec_test.js
index a20b2e5029..36c76ac6f4 100644
--- a/e2e/tests/api_tests/lrspec/api_1v1_spec_test.js
+++ b/e2e/tests/api_tests/lrspec/api_1v1_spec_test.js
@@ -20,12 +20,13 @@ Scenario('1v1 part admit', async ({I, api_spec}) => {
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION');
 });
 
-Scenario('1v1 counter claim', async ({I, api_spec}) => {
+Scenario('1v1 counter claim @api-spec-counterclaim', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser);
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'COUNTER_CLAIM');
 });
 
-Scenario('1v1 full defence claimant and defendant response', async ({I, api_spec}) => {
+
+Scenario('1v1 full defence claimant and defendant response @api-spec-full-defence', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser);
   await api_spec.informAgreedExtensionDate(config.applicantSolicitorUser);
   await api_spec.defendantResponse(config.defendantSolicitorUser);
@@ -33,14 +34,14 @@ Scenario('1v1 full defence claimant and defendant response', async ({I, api_spec
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('1v1 full admit claimant and defendant response', async ({I, api_spec}) => {
+Scenario('1v1 full admit claimant and defendant response @api-spec-full-admit', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'FULL_ADMISSION');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_ADMISSION');
   await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_ADMISSION', 'ONE_V_ONE',
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('1v1 part admit defence claimant and defendant response', async ({I, api_spec}) => {
+Scenario('1v1 part admit defence claimant and defendant response @api-spec-part-admit', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'PART_ADMISSION');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION');
   await api_spec.claimantResponse(config.applicantSolicitorUser, 'PART_ADMISSION', 'ONE_V_ONE',
diff --git a/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js b/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js
index d5be2833cf..98e3156209 100644
--- a/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js
+++ b/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js
@@ -4,7 +4,7 @@ const config = require('../../../config.js');
 const {checkCarmToggleEnabled} = require('../../../api/testingSupport');
 
 Feature('CCD 1v2 API test @api-spec-fast @api-nightly-prod');
-Scenario('1v2 fast claim counter claim', async ({I, api_spec_fast}) => {
+Scenario('1v2 fast claim counter claim @api-spec-counterclaim', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'COUNTER_CLAIM', 'ONE_V_TWO');
 });
@@ -26,7 +26,7 @@ Scenario('1v2 different response no full defence', async ({I, api_spec_fast}) =>
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'DIFF_NOT_FULL_DEFENCE', 'ONE_V_TWO');
 });
 
-Scenario('1v2 full defence and claimant response', async ({I, api_spec_fast}) => {
+Scenario('1v2 full defence and claimant response @api-spec-full-defence', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO');
   await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO',
@@ -60,14 +60,14 @@ Scenario('1v2 fast claim part admit, defendant response', async ({I, api_spec_fa
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION', 'ONE_V_TWO');
 });
 
-Scenario('1v2 fast claim fast claim full admit, defendant and claimant response', async ({I, api_spec_fast}) => {
+Scenario('1v2 fast claim fast claim full admit, defendant and claimant response @api-spec-full-admit', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_ADMISSION', 'ONE_V_TWO');
   await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'FULL_ADMISSION', 'ONE_V_TWO',
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('1v2 fast claim part admit, defendant and claimant response', async ({I, api_spec_fast}) => {
+Scenario('1v2 fast claim part admit, defendant and claimant response @api-spec-part-admit', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION', 'ONE_V_TWO');
   await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'PART_ADMISSION', 'ONE_V_TWO',
diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js
index 7e5f14612b..282242a0cc 100644
--- a/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js
+++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js
@@ -10,7 +10,7 @@ Scenario('2v1 fast claim full defence', async ({I, api_spec_fast}) => {
   await api_spec_fast.manageCaseFlags(config.hearingCenterAdminWithRegionId2);
 });
 
-Scenario('2v1 fast claim counter claim', async ({I, api_spec_fast}) => {
+Scenario('2v1 fast claim counter claim @api-spec-counterclaim', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'COUNTER_CLAIM', 'TWO_V_ONE');
 });
@@ -32,7 +32,7 @@ xScenario('2v1 fast claim part admission', async ({I, api_spec_fast}) => {
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION', 'TWO_V_ONE');
 });
 
-Scenario('2v1 fast claim full defence and claimant response  @api-prod @api-nonprod-specified', async ({I, api_spec_fast}) => {
+Scenario('2v1 fast claim full defence and claimant response  @api-prod @api-nonprod-specified @api-spec-full-defence', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE');
   await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE',
@@ -46,14 +46,14 @@ Scenario('2v1 fast claim full defence and not proceed', async ({I, api_spec_fast
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('2v1 fast claim full admission and claimant response', async ({I, api_spec_fast}) => {
+Scenario('2v1 fast claim full admission and claimant response @api-spec-full-admit', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_ADMISSION', 'TWO_V_ONE');
   await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'FULL_ADMISSION', 'TWO_V_ONE',
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('2v1 fast claim part admission and claimant response', async ({I, api_spec_fast}) => {
+Scenario('2v1 fast claim part admission and claimant response @api-spec-part-admit', async ({I, api_spec_fast}) => {
   await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION', 'TWO_V_ONE');
   await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'PART_ADMISSION', 'TWO_V_ONE',
diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js
index 0f12a243f1..3dd21b0237 100644
--- a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js
+++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js
@@ -10,7 +10,7 @@ Scenario('2v1 small claim full defence', async ({I, api_spec}) => {
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE');
 });
 
-Scenario('2v1 small claim counter claim', async ({I, api_spec}) => {
+Scenario('2v1 small claim counter claim @api-spec-counterclaim', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'COUNTER_CLAIM', 'TWO_V_ONE');
 });
@@ -35,28 +35,28 @@ Scenario('2v1 small claim different response no full defence', async ({I, api_sp
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'DIFF_NOT_FULL_DEFENCE', 'TWO_V_ONE');
 });
 
-Scenario('2v1 small claim full defence and defendant response', async ({I, api_spec}) => {
+Scenario('2v1 small claim full defence and defendant response @api-spec-full-defence', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE');
   await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE',
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('2v1 small claim full defence and not proceed', async ({I, api_spec}) => {
+Scenario('2v1 small claim full defence and not proceed @api-spec-full-defence', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE');
   await api_spec.claimantResponse(config.applicantSolicitorUser, 'NOT_PROCEED', 'TWO_V_ONE',
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('2v1 small claim part admission and response', async ({I, api_spec}) => {
+Scenario('2v1 small claim part admission and response @api-spec-part-admit', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'PART_ADMISSION', 'TWO_V_ONE');
   await api_spec.claimantResponse(config.applicantSolicitorUser, 'PART_ADMISSION', 'TWO_V_ONE',
     'AWAITING_APPLICANT_INTENTION');
 });
 
-Scenario('2v1 small claim full admission and response', async ({I, api_spec}) => {
+Scenario('2v1 small claim full admission and response @api-spec-full-admit', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
   await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_ADMISSION', 'TWO_V_ONE');
   await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_ADMISSION', 'TWO_V_ONE',
diff --git a/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js b/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js
index fbbacb835b..0a14557c2a 100644
--- a/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js
+++ b/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js
@@ -10,7 +10,7 @@ const caseWorkerUser = config.testEarlyAdopterCourts ? config.hearingCenterAdmin
 // const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local;
 const fastClaimAmount = '11000';
 
-Feature('Transfer Online Case 1v1 API test - fast claim - unspec @api-unspec @api-nightly-prod');
+Feature('Transfer Online Case 1v1 API test - fast claim - unspec @api-unspec @api-nightly-prod @api-toc');
 
 async function prepareClaim(api) {
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario1v1, fastClaimAmount);
@@ -43,7 +43,7 @@ AfterSuite(async ({api}) => {
   await api.cleanUp();
 });
 
-Feature('Transfer Online Case 1v2 API test - fast claim - unspec @api-unspec @api-tests-1v2SS @api-nightly-prod');
+Feature('Transfer Online Case 1v2 API test - fast claim - unspec @api-unspec @api-tests-1v2SS @api-nightly-prod @api-toc');
 
 Scenario('1v2 full defence unspecified - not suitable SDO - Transfer Case)', async ({api}) => {
     await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario1v2, fastClaimAmount);
@@ -61,7 +61,7 @@ AfterSuite(async ({api}) => {
   await api.cleanUp();
 });
 
-Feature('Transfer Online Case 1v2 API test - small claim - spec @api-spec-1v2 @api-nightly-prod');
+Feature('Transfer Online Case 1v2 API test - small claim - spec @api-spec-1v2 @api-nightly-prod @api-toc');
 
 Scenario('Transfer Online Spec claim 1v2 - not suitable SDO - Transfer Case', async ({api_spec}) => {
     await prepareClaimSpec(api_spec);
diff --git a/e2e/tests/api_tests/sdo/sdo_test.js b/e2e/tests/api_tests/sdo/sdo_test.js
index 46707f87fe..5b701d4435 100644
--- a/e2e/tests/api_tests/sdo/sdo_test.js
+++ b/e2e/tests/api_tests/sdo/sdo_test.js
@@ -204,7 +204,7 @@ Scenario('1v1 full defence unspecified - judge draws disposal order - hearing sc
   }
 });
 
-Scenario('1v1 full defence specified - legal advisor draws disposal order - hearing scheduled @wa-r4', async ({api_spec_small, WA}) => {
+Scenario('1v1 full defence specified - legal advisor draws disposal order - hearing scheduled @wa-r4 @sdo-spec @api-sdo', async ({api_spec_small, WA}) => {
   // sdo requires judicial_referral, which is not past preview
   await prepareSpecSmallClaim(api_spec_small);
   if (config.runWAApiTest) {
diff --git a/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js b/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js
index e29b288b72..c604c962d8 100644
--- a/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js
+++ b/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js
@@ -10,7 +10,7 @@ const claimAmount = '100';
 
 let mediationAdminRegion4 = config.localMediationTests ? config.nbcUserLocal : config.nbcUserWithRegionId4;
 
-Feature('Dispute resolution hearing API test - fast claim - unspec @api-unspec @api-tests-1v1 @api-nonprod');
+Feature('Dispute resolution hearing API test - fast claim - unspec @api-unspec @api-tests-1v1 @api-nonprod @api-r2-sdo');
 
 async function prepareClaim(api) {
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario1v1, claimAmount);
diff --git a/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js b/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js
index cb9dba92cb..e7cf399ec4 100644
--- a/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js
+++ b/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js
@@ -10,7 +10,7 @@ const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearin
 //const hearingCenterAdminToBeUsed = config.hearingCenterAdminLocal;
 
 
-Feature('Noise Induced Hearing Loss API test - fast claim - unspec @api-unspec @api-tests-1v1 @api-nonprod');
+Feature('Noise Induced Hearing Loss API test - fast claim - unspec @api-unspec @api-tests-1v1 @api-nonprod @api-r2-sdo');
 
 async function prepareClaim(api) {
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario1v1Nihl, claimAmount);
diff --git a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js
index 2260f8e09d..98c7290348 100644
--- a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js
+++ b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js
@@ -11,7 +11,7 @@ await api_spec_small.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFE
 await api_spec_small.claimantResponse(config.applicantSolicitorUser, true);
 }
 
-Feature('Request for reconsideration - 1v1 - spec @api-specified @api-nightly-prod');
+Feature('Request for reconsideration - 1v1 - spec @api-specified @api-nightly-prod @api-r2-sdo');
 
 Scenario('1v1 spec request for reconsideration for uphold previous order', async ({api_spec_small}) => {
   if (['preview', 'demo'].includes(config.runningEnv)) {
diff --git a/e2e/tests/api_tests/sdo_R2/sdo_flight_delay_test.js b/e2e/tests/api_tests/sdo_R2/sdo_flight_delay_test.js
index ccd202ecec..07ff257659 100644
--- a/e2e/tests/api_tests/sdo_R2/sdo_flight_delay_test.js
+++ b/e2e/tests/api_tests/sdo_R2/sdo_flight_delay_test.js
@@ -21,7 +21,8 @@ async function prepareClaimOtherOption(api_spec, claimAmount) {
 }
 
 Feature('Create SDO SmallTrack- Flight Delay - 1v1 - spec @api-specified @api-nonprod');
-Scenario('1v1 full defence unspecified - judge draws small claims WITHOUT sum of damages - flight delay', async ({api_spec}) => {
+
+Scenario('1v1 full defence unspecified - judge draws small claims WITHOUT sum of damages - flight delay @api-r2-sdo', async ({api_spec}) => {
   if (['preview', 'demo'].includes(config.runningEnv)) {
     await prepareClaim(api_spec, claimAmountSmallTrack);
     await api_spec.createSDO(judgeUser, 'CREATE_SMALL');
@@ -37,7 +38,7 @@ Scenario('1v1 full defence unspecified - judge draws small claims WITHOUT sum of
   }
 });
 
-Scenario('1v1 specified - flight delay other option Small-claim', async ({api_spec}) => {
+Scenario('1v1 specified - flight delay other option Small-claim @api-spec-full-defence', async ({api_spec}) => {
   if (['preview', 'demo'].includes(config.runningEnv)) {
     await prepareClaimOtherOption(api_spec, claimAmountSmallTrack);
   }
diff --git a/package.json b/package.json
index 13b8ae0d7b..e33d948bce 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,11 @@
     "test:smoke": "yarn playwright install && MOCHAWESOME_REPORTFILENAME=smoke REPORT_DIR=test-results/smokeTest REPORT_FILE=test-results/smokeTest/results.xml  npx codeceptjs run --grep @smoke-tests-unspec --reporter mocha-multi --verbose",
     "test:smoke-spec": "MOCHAWESOME_REPORTFILENAME=smoke npx codeceptjs run --grep @smoke-tests-spec --reporter mocha-multi --verbose",
     "test:api-unspec": "MOCHAWESOME_REPORTFILENAME=api-unspec npx codeceptjs run-workers --suites 4  --grep @api-unspec --reporter mocha-multi --verbose",
+    "test:api-unspec-full-defence": "MOCHAWESOME_REPORTFILENAME=api-unspec-full-defence npx codeceptjs run-workers --suites 4  --grep @api-unspec-full-defence --reporter mocha-multi --verbose",
     "test:e2e-unspec": "MOCHAWESOME_REPORTFILENAME=e2e-unspec npx codeceptjs run-workers --suites 4 --grep @e2e-unspec --reporter mocha-multi --verbose",
     "test:api-sdo": "MOCHAWESOME_REPORTFILENAME=api-sdo npx codeceptjs run-workers --suites 4 --grep @api-sdo --reporter mocha-multi --verbose",
+    "test:api-r2-sdo": "MOCHAWESOME_REPORTFILENAME=api-r2-sdo npx codeceptjs run-workers --suites 4 --grep @api-r2-sdo --reporter mocha-multi --verbose",
+    "test:api-toc": "MOCHAWESOME_REPORTFILENAME=api-toc npx codeceptjs run-workers --suites 4 --grep @api-toc --reporter mocha-multi --verbose",
     "test:e2e-sdo": "MOCHAWESOME_REPORTFILENAME=e2e-sdo npx codeceptjs run-workers --suites 3 --grep @e2e-sdo --reporter mocha-multi --verbose",
     "test:api-dj": "MOCHAWESOME_REPORTFILENAME=api-dj npx codeceptjs  run-workers --suites 4  --grep @api-dj --reporter mocha-multi --verbose",
     "test:e2e-dj": "MOCHAWESOME_REPORTFILENAME=e2e-dj NODE_TLS_REJECT_UNAUTHORIZED=0 npx codeceptjs run-workers --suites 2 --grep @e2e-1v1-dj --reporter mocha-multi --verbose",
@@ -37,6 +40,10 @@
     "test:api-spec-1v2": "MOCHAWESOME_REPORTFILENAME=api-spec npx codeceptjs run --grep @api-spec-1v2 --reporter mocha-multi --verbose",
     "test:api-spec-1v1": "MOCHAWESOME_REPORTFILENAME=api-spec npx codeceptjs run --grep @api-spec-1v1 --reporter mocha-multi --verbose",
     "test:api-spec-small": "MOCHAWESOME_REPORTFILENAME=api-spec npx codeceptjs run --grep @api-spec-small --reporter mocha-multi --verbose",
+    "test:api-spec-full-defence": "MOCHAWESOME_REPORTFILENAME=api-spec-full-defence npx codeceptjs run --grep @api-spec-full-defence --reporter mocha-multi --verbose",
+    "test:api-spec-part-admit": "MOCHAWESOME_REPORTFILENAME=api-spec-part-admit npx codeceptjs run --grep @api-spec-part-admit --reporter mocha-multi --verbose",
+    "test:api-spec-full-admit": "MOCHAWESOME_REPORTFILENAME=api-spec-full-admit npx codeceptjs run --grep @api-spec-full-admit --reporter mocha-multi --verbose",
+    "test:api-spec-counterclaim": "MOCHAWESOME_REPORTFILENAME=api-spec-counterclaim npx codeceptjs run --grep @api-spec-counterclaim --reporter mocha-multi --verbose",
     "test:e2e-spec": "MOCHAWESOME_REPORTFILENAME=e2e-spec npx codeceptjs run-workers --suites 2 --grep @e2e-spec-1v2DS --reporter mocha-multi --verbose",
     "test:e2e-spec-1v2DS": "MOCHAWESOME_REPORTFILENAME=e2e-spec npx codeceptjs run --grep @e2e-spec-1v2DS --reporter mocha-multi --verbose",
     "test:functional-unspec": "MOCHAWESOME_REPORTFILENAME=functional-unspec npx codeceptjs run --grep '@e2e-unspec-1v2DS' --reporter mocha-multi --verbose",
@@ -46,7 +53,7 @@
     "test:functional-dj": "MOCHAWESOME_REPORTFILENAME=functional-unspec npx codeceptjs run --grep @e2e-dj --reporter mocha-multi --verbose",
     "test:nightly-multiparty": "MOCHAWESOME_REPORTFILENAME=nightly-multiparty npx codeceptjs run --grep '@e2e-nightly' --reporter mocha-multi --verbose",
     "test:rpa": "MOCHAWESOME_REPORTFILENAME=rpa npx codeceptjs run --grep @rpa-handoff-tests --reporter mocha-multi --verbose",
-    "test:rpa-spec": "MOCHAWESOME_REPORTFILENAME=rpa-spec npx codeceptjs run --grep @rpa-handoff-tests-spec --reporter mocha-multi --verbose",
+    "test:api-rpa-spec": "MOCHAWESOME_REPORTFILENAME=rpa-spec npx codeceptjs run --grep @rpa-handoff-tests-spec --reporter mocha-multi --verbose",
     "test:crossbrowser-e2e": "MOCHAWESOME_REPORTFILENAME=crossbrowser codeceptjs run-multiple --grep @cross-browser-tests ${BROWSER_GROUP:-'--all'} -c saucelabs.conf.js --reporter mocha-multi",
     "test:crossbrowser": "./e2e/run-crossbrowser-tests.sh",
     "test:AATFunctional": "./e2e/run-prod-functional-tests.sh",