FINERACT-2070: Remove TestRailId annotations
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization.feature b/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization.feature
index 6a8dbbb..f11d1a9 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization.feature
@@ -1,7 +1,7 @@
 @AssetExternalizationFeature
 Feature: Asset Externalization
 
-  @TestRailId:C2722
+
   Scenario: Verify that all fields and values are correct in case of a SALES request by loan id and user-generated transferExternalId
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -26,7 +26,7 @@
     Then Asset externalization details has the generated transferExternalId
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2723
+
   Scenario: Verify that all fields and values are correct in case of a SALES request by loan id system-generated transferExternalId
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -51,7 +51,7 @@
     Then Asset externalization details has the generated transferExternalId
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2724
+
   Scenario: Verify that all fields and values are correct in case of a SALES request by loan external id user-generated transferExternalId
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -76,7 +76,7 @@
     Then Asset externalization details has the generated transferExternalId
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2725
+
   Scenario: Verify that all fields and values are correct in case of a SALES request by loan external id system-generated transferExternalId
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -101,7 +101,7 @@
     Then Asset externalization details has the generated transferExternalId
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2727
+
   Scenario: Verify that Asset externalization details are correct after CoB in case of a SALES request by loan id
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -125,7 +125,7 @@
       | 2023-05-21     | 1                  | ACTIVE  | 2023-05-22    | 9999-12-31  | SALE             |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2729
+
   Scenario: Verify that Asset externalization details has the correct data in case of a BUYBACK request placed before the settlementDate with a same settlementDate as the sales one
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -161,7 +161,7 @@
       | 2023-05-21     | 1                  | CANCELLED | 2023-05-21    | 2023-05-21  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2730
+
   Scenario: Verify that Asset externalization details has the correct data in case of a BUYBACK request placed on a business date before the settlementDate of sales request and with a settlementDate for buyback after the sales got active
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -202,7 +202,7 @@
       | 2023-05-21     | 1                  | ACTIVE  | 2023-05-22    | 2023-05-30  | SALE             |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2731
+
   Scenario: Verify that Asset externalization details has the correct data in case of a BUYBACK request placed after the settlementDate
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -247,7 +247,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-25    | 2023-05-30  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2732
+
   Scenario: Verify that BUYBACK request on a loan with PENDING ownership where BUYBACK settlement date is earlier than SALE settlement date results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -270,7 +270,7 @@
       | buyback          | 2023-05-15     |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2733
+
   Scenario: Verify that SALES request on a fully paid loan results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -286,7 +286,7 @@
       | sale             | 2023-05-21     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2734
+
   Scenario: Verify that SALES request on an overpaid loan results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -302,7 +302,7 @@
       | sale             | 2023-05-21     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2735
+
   Scenario: Verify that SALES request on a loan with ACTIVE ownership results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -332,7 +332,7 @@
       | sale             | 2023-05-30     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2736
+
   Scenario: Verify that BUYBACK request on a fully paid loan can be done successfully
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -369,7 +369,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-25    | 9999-12-31  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2737
+
   Scenario: Verify that BUYBACK request on an overpaid loan can be done successfully
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -406,7 +406,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-25    | 9999-12-31  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2738
+
   Scenario: Verify that BUYBACK request on a loan with INACTIVE ownership results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -420,7 +420,7 @@
       | buyback          | 2023-05-21     |                    |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2739
+
   Scenario: Verify that SALES request can NOT be placed on a loan which is not APPROVED yet
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -432,7 +432,7 @@
       | sale             | 2023-05-30     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2740
+
   Scenario: Verify that SALES request can NOT be placed on a loan which is not DISBURSED yet
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -445,7 +445,7 @@
       | sale             | 2023-05-30     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2741
+
   Scenario: Verify that SALES request on a loan with PENDING ownership results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -468,7 +468,7 @@
       | sale             | 2023-05-30     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2742
+
   Scenario: Verify that SALES with settlement date earlier than actual business date results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -482,7 +482,7 @@
       | sale             | 2023-04-21     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2743
+
   Scenario: Verify that SALES with null owner external id results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -496,7 +496,7 @@
       | 2023-05-21     | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2744
+
   Scenario: Verify that SALES with null purchase price ratio results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -510,7 +510,7 @@
       | sale             | 2023-05-21     |                    |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2745
+
   Scenario: Verify that SALES with null settlement date results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -524,7 +524,7 @@
       | sale             |                | 1                  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2746
+
   Scenario: Verify that BUYBACK request on a loan with PENDING BUYBACK ownership result an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -565,7 +565,7 @@
       | buyback          | 2023-05-30     |                    |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2747
+
   Scenario: Verify that BUYBACK with settlement date earlier than actual business date results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -596,7 +596,7 @@
       | buyback          | 2023-05-21     |                    |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2748
+
   Scenario: Verify that BUYBACK with ownerExternalId=NULL can be placed, and results a 200OK response
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -630,7 +630,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-25    | 9999-12-31  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2749
+
   Scenario: Verify that BUYBACK with purchasePriceRatio=NULL can be placed, and results a 200OK response
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -666,7 +666,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-25    | 9999-12-31  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2750
+
   Scenario: Verify that SALES with null settlement date results an error
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -697,7 +697,7 @@
       | buyback          |                |                    |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2751 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: no other transactions
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -759,7 +759,7 @@
       | ASSET         | 112601        | Loans Receivable | CREDIT    | 1000.00 |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2752 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: fee applied before sale, and penalty applied before buyback
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -836,7 +836,7 @@
       | ASSET         | 112603        | Interest/Fee Receivable | CREDIT    | 30.00   |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2753 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: Repyment while status is ACTIVE
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -901,7 +901,7 @@
       | ASSET         | 112601        | Loans Receivable          | CREDIT    | 800.00  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2754 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: GOODWILL_CREDIT transaction while status is ACTIVE
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -966,7 +966,7 @@
       | ASSET         | 112601        | Loans Receivable         | CREDIT    | 800.00  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2755 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: MERCHANT_ISSUED_REFUND transaction while status is ACTIVE
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1031,7 +1031,7 @@
       | ASSET         | 112601        | Loans Receivable          | CREDIT    | 800.00  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2756 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: PAYOUT_REFUND transaction while status is ACTIVE
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1096,7 +1096,7 @@
       | ASSET         | 112601        | Loans Receivable          | CREDIT    | 800.00  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2757 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: REPAYMENT_ADJUSTMENT_REFUND chargeback transaction while status is ACTIVE
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1166,7 +1166,7 @@
       | ASSET         | 112601        | Loans Receivable          | CREDIT    | 800.00  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2758 @AssetExternalizationJournalEntry
+   @AssetExternalizationJournalEntry
   Scenario: Verify that Asset externalization SALES and BUYBACK has the correct Journal entries: CHARGE ADJUSTMENT transaction while status is ACTIVE
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1239,7 +1239,7 @@
       | ASSET         | 112603        | Interest/Fee Receivable | CREDIT    | 200.00  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2759
+
   Scenario: Verify that LoanOwnershipTransferBusinessEvent and LoanAccountSnapshotBusinessEvent is created with correct data
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1279,7 +1279,7 @@
     Then LoanAccountSnapshotBusinessEvent is created
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2760
+
   Scenario: Verify that LoanOwnershipTransferBusinessEvent and LoanAccountSnapshotBusinessEvent is created with correct data for partial repayment, fee, penalty
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1323,7 +1323,7 @@
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
     #  TODO right now COB does not pick up closed loans
-  @Skip @temp600
+  @Skip
   Scenario: Verify that when loan got fully paid while SALES on PENDING ..........
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1351,7 +1351,7 @@
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
 #  TODO right now COB does not pick up closed loans
-  @Skip @temp700
+  @Skip
   Scenario: Verify that when loan got overpaid while SALES on PENDING ..........
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1411,7 +1411,7 @@
     And Customer makes "AUTOPAY" repayment on "25 May 2023" with 200 EUR transaction amount and check external owner
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2771
+
   Scenario: Verify that SALE and BUYBACK can be cancelled in right order
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1452,7 +1452,7 @@
       | 2023-05-21     | 1                  | CANCELLED | 2023-05-01    | 2023-05-10  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2772
+
   Scenario: Verify that SALE can be cancelled
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1476,7 +1476,7 @@
       | 2023-05-21     | 1                  | CANCELLED | 2023-05-01    | 2023-05-10  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2773
+
   Scenario: Verify that active SALE can not be cancelled
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1501,7 +1501,7 @@
     When Admin send "cancel" command on "SALE" transaction it will throw an error
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2774
+
   Scenario: Verify that Asset cannot be cancelled after SALE and BUYBACK is completed
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1543,7 +1543,7 @@
     When Admin send "cancel" command on "SALE" transaction it will throw an error
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2775
+
   Scenario: Verify that SALE and BUYBACK can be cancelled in right order with double cancel test
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1604,7 +1604,7 @@
       | 2023-05-21     | 1                  | CANCELLED | 2023-05-01    | 2023-05-10  |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2785
+
   Scenario: Verify that when a loan with PENDING SALES is fully paid asset transfer status will be DECLINED
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1630,7 +1630,7 @@
     Then LoanOwnershipTransferBusinessEvent with transfer status: "DECLINED" and transfer status reason "BALANCE_ZERO" is created
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2786
+
   Scenario: Verify that when a loan with PENDING SALES is overpaid asset transfer status will be DECLINED
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1656,7 +1656,7 @@
     Then LoanOwnershipTransferBusinessEvent with transfer status: "DECLINED" and transfer status reason "BALANCE_NEGATIVE" is created
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2787
+
   Scenario: Verify that when a loan with PENDING BUYBACK is fully paid BUYBACK transaction can be done successfully
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1698,7 +1698,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-22    | 2023-05-25  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2788
+
   Scenario: Verify that when a loan with PENDING BUYBACK is overpaid BUYBACK transaction can be done successfully
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
@@ -1740,7 +1740,7 @@
       | 2023-05-30     | 1                  | BUYBACK | 2023-05-22    | 2023-05-25  | BUYBACK          |
     Then Admin removes EXTERNAL_ASSET_OWNER_TRANSFER job from LOAN_CLOSE_OF_BUSINESS workflow
 
-  @TestRailId:C2811
+
   Scenario: Verify that transaction and transaction adjustment events has the proper external owner
     Given Admin puts EXTERNAL_ASSET_OWNER_TRANSFER job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "1 May 2023"
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/BatchApi.feature b/fineract-e2e-tests-runner/src/test/resources/features/BatchApi.feature
index 0923a1f..b6af745 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/BatchApi.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/BatchApi.feature
@@ -1,12 +1,12 @@
 @BatchApiFeature
 Feature: Batch API
 
-  @TestRailId:C63
+
   Scenario: As a user I would like to run a sample Batch API scenario
     When Batch API sample call ran
     Then Admin checks that all steps result 200OK
 
-  @TestRailId:C2484 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in case of BatchAPI call with the same idempotency key on two repayments
     When Batch API call runs with idempotency key
     Then Admin checks that all steps result 200OK for Batch API idempotency request
@@ -16,24 +16,24 @@
     Then Batch API response has the same idempotency key in segment with requestId 6 as in segment with requestId 5
     Then Loan has 1 "REPAYMENT" transactions on Transactions tab after Batch API run
 
-  @TestRailId:C2640
+
   Scenario: Verify Batch API call in case of enclosing transaction is TRUE and all steps result 200OK
     When Batch API call with steps: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "true"
     Then Admin checks that all steps result 200OK
 
-  @TestRailId:C2641
+
   Scenario: Verify Batch API call in case of enclosing transaction is TRUE and one of the steps fails
     When Batch API call with steps: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "true", with failed approve step
     Then Verify that step 3 throws an error with error code 404
     Then Nr. 1 Client creation was rolled back
     Then Nr. 1 Loan creation was rolled back
 
-  @TestRailId:C2642
+
   Scenario: Verify Batch API call in case of enclosing transaction is FALSE and all steps result 200OK
     When Batch API call with steps: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "false"
     Then Admin checks that all steps result 200OK
 
-  @TestRailId:C2643
+
   Scenario: Verify Batch API call in case of enclosing transaction is FALSE, there is only one reference-tree and one of the steps fails
     When Batch API call with steps: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "false", with failed approve step
     Then Verify that step Nr. 1 results 200
@@ -43,12 +43,12 @@
     Then Nr. 1 Client was created
     Then Nr. 1 Loan was created
 
-  @TestRailId:C2644
+
   Scenario: Verify Batch API call in case of enclosing transaction is FALSE, there are two reference-trees and all steps result 200
     When Batch API call with steps done twice: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "false"
     Then Admin checks that all steps result 200OK
 
-  @TestRailId:C2645
+
   Scenario: Verify Batch API call in case of enclosing transaction is FALSE, there are two reference-trees and one of the steps in second tree fails
     When Batch API call with steps done twice: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "false", with failed approve step in second tree
     Then Verify that step Nr. 1 results 200
@@ -65,14 +65,14 @@
     Then Nr. 2 Client was created
     Then Nr. 2 Loan was created
 
-  @TestRailId:C2646
+
   Scenario: Verify Batch API call in case of enclosing transaction is FALSE and one of the steps is doubled
     When Batch API call with steps: createClient, createLoan, approveLoan, getLoanDetails runs with enclosingTransaction: "false", and approveLoan is doubled
     Then Admin checks that all steps result 200OK
     Then Batch API response has no "x-served-from-cache" field in segment with requestId 3
     Then Batch API response has boolean value in header "x-served-from-cache": "true" in segment with requestId 4
 
-  @TestRailId:C2840
+
   Scenario: Verify datatable Batch API calls, when the second request relies on the first response, but the first response is empty
     When A datatable for "Loan" is created
     And Batch API call with steps: queryDatatable, updateDatatable runs, with empty queryDatatable response
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/BusinessDate.feature b/fineract-e2e-tests-runner/src/test/resources/features/BusinessDate.feature
index 90f8eeb..2abd5d1 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/BusinessDate.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/BusinessDate.feature
@@ -1,27 +1,27 @@
 @BusinessDateFeature
 Feature: BusinessDate
 
-  @TestRailId:C38
+
   Scenario: As a user I would like to enable the Business date configuration
     Given Global configuration "enable_business_date" is enabled
 
-  @TestRailId:C39
+
   Scenario: As a user I would like to disable the Business date configuration
     Given Global configuration "enable_business_date" is disabled
 
-  @TestRailId:C40
+
   Scenario: As a user I would like to set the business date
     When Admin sets the business date to "10 July 2022"
     Then Admin checks that the business date is correctly set to "10 July 2022"
 
-  @TestRailId:C41
+
   Scenario: As a user I would like to change the business date manually
     When Admin sets the business date to "10 July 2022"
     Then Admin checks that the business date is correctly set to "10 July 2022"
     When Admin sets the business date to "11 July 2022"
     Then Admin checks that the business date is correctly set to "11 July 2022"
 
-  @TestRailId:C27
+
   Scenario: As a user I would like to change the business date with scheduled job
     When Admin sets the business date to "10 July 2022"
     When Admin runs the Increase Business Date by 1 day job
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/COB.feature b/fineract-e2e-tests-runner/src/test/resources/features/COB.feature
index c034933..ed55fce 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/COB.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/COB.feature
@@ -1,7 +1,7 @@
 @COBFeature
 Feature: COBFeature
 
-  @TestRailId:C2501 @Skip
+   @Skip
   Scenario: As an admin I would like to see that last closed business date got updated after COB catch up job finished
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -22,7 +22,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
 
 
-  @TestRailId:C2681 @Skip
+   @Skip
   Scenario: As an admin I would like to check that the Delinquency bucket set on the loan correctly when the arrears setting is 3 on the product
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -33,7 +33,7 @@
     When Admin runs COB job
     Then Admin checks that delinquency range is: "RANGE_1" and has delinquentDate "2022-02-03"
 
-  @TestRailId:C2791 @Skip
+   @Skip
   Scenario: Verify that COB processes loans which are not closed/overpaid and has a last_closed_business_date exactly 1 day behind COB date
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -49,7 +49,7 @@
     When Admin runs COB job
     Then Admin checks that last closed business date of loan is "02 July 2023"
 
-  @TestRailId:C2792
+
   Scenario: Verify that COB doesn’t touch loans with last closed business date behind COB date
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -74,7 +74,7 @@
       | RANGE_3                | 09 August 2023 |                |
       | RANGE_1                | 04 August 2023 | 09 August 2023 |
 
-  @TestRailId:C2793
+
   Scenario: Verify that COB doesn’t touch CLOSED loans
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -106,7 +106,7 @@
       | RANGE_3                | 09 August 2023 | 10 August 2023 |
       | RANGE_1                | 04 August 2023 | 09 August 2023 |
 
-  @TestRailId:C2794
+
   Scenario: Verify that COB doesn’t touch OVERPAID loans
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -138,7 +138,7 @@
       | RANGE_3                | 09 August 2023 | 10 August 2023 |
       | RANGE_1                | 04 August 2023 | 09 August 2023 |
 
-  @TestRailId:C2795 @Skip
+   @Skip
   Scenario: Verify that COB catch up runs properly on loan which is behind date because of locked with error
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -161,7 +161,7 @@
     And Customer makes "AUTOPAY" repayment on "05 January 2022" with 1000 EUR transaction amount
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
 
-  @TestRailId:C2796
+
   Scenario: Verify that after COB runs there are no unreleased loan locks
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -174,7 +174,7 @@
     When Admin runs COB job
     Then The loan account is not locked
 
-  @TestRailId:C2797 @Skip
+   @Skip
   Scenario: Verify that Inline COB is executed for stuck loans - when payment happened on a loan with last closed business date in the past, COB got executed before the repayment
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -194,7 +194,7 @@
 
 #  On a hard locked loan, in case of the lock has an error message, payment by a non-bypass user should trigger inlineCob and it should be executed
 #  this functionality is not implemented yet
-  @Skip @TestRailId:C2798
+  @Skip
   Scenario: Verify that Inline COB is executed for stuck loans - when payment happened on a locked loan COB got executed before the repayment
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -213,7 +213,7 @@
     When Created user makes externalID controlled "AUTOPAY" repayment on "04 July 2023" with 500 EUR transaction amount
     Then Admin checks that last closed business date of loan is "03 July 2023"
 
-  @TestRailId:C3044 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that LoanAccountCustomSnapshotBusinessEvent is created with proper business date when installment is due date and COB runs
     Given Admin puts CHECK_DUE_INSTALLMENTS job into LOAN_CLOSE_OF_BUSINESS workflow
     When Admin sets the business date to "01 January 2024"
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/Client.feature b/fineract-e2e-tests-runner/src/test/resources/features/Client.feature
index 1a14f23..2a053b4 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/Client.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/Client.feature
@@ -20,7 +20,7 @@
 @ClientFeature
 Feature: Client
 
-  @TestRailId:C14 @Smoke
+   @Smoke
   Scenario Outline: Client creation functionality for Fineract
     When Admin creates a client with Firstname <firstName> and Lastname <lastName>
     Then Client is created successfully
@@ -28,11 +28,11 @@
       | firstName    | lastName |
       | "FirstName1" | "Test1"  |
 
-  @TestRailId:C15
+
   Scenario Outline: Client creation with address functionality for Fineract
     When Global configuration "Enable-Address" is enabled
     When Admin creates a client with Firstname <firstName> and Lastname <lastName> with address
     Then Client is created successfully
     Examples:
       | firstName    | lastName |
-      | "FirstName2" | "Test2"  |
\ No newline at end of file
+      | "FirstName2" | "Test2"  |
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/InlineCOB.feature b/fineract-e2e-tests-runner/src/test/resources/features/InlineCOB.feature
index 1bbed7d..928ee13 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/InlineCOB.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/InlineCOB.feature
@@ -1,7 +1,7 @@
 @InlineCOBFeature
 Feature: InlineCOBFeature
 
-  @TestRailId:C2457
+
   Scenario: As an admin I would like to see that inline COB Happy Path scenario is working properly
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -12,7 +12,7 @@
     When Admin runs inline COB job for Loan
     Then Admin checks that delinquency range is: "RANGE_3" and has delinquentDate "2022-02-03"
 
-  @TestRailId:C2473
+
   Scenario: As an admin I would like to see that loan was catching up with inline COB
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -27,7 +27,7 @@
     When Admin runs inline COB job for Loan
     Then Admin checks that last closed business date of loan is "04 January 2022"
 
-  @TestRailId:C2554
+
   Scenario: As an admin I would like to see that loan was catching up with inline COB on a repayment
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -44,7 +44,7 @@
     And Created user makes "AUTOPAY" repayment on "5 January 2022" with 100 EUR transaction amount
     Then Admin checks that last closed business date of loan is "04 January 2022"
 
-  @TestRailId:C2602
+
   Scenario: Verify that LoanCOBApiFilter works fine in the background and loanId controlled transaction does not trigger inlineCOB if COB had not been applied on loan before
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -67,7 +67,7 @@
       | RANGE_1                | 06 January 2023 | 07 January 2023 |
     Then Admin checks that last closed business date of loan is "null"
 
-  @TestRailId:C2603
+
   Scenario: Verify that LoanCOBApiFilter works fine in the background and externalId controlled transaction does not trigger inlineCOB if COB had not been applied on loan before
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -90,7 +90,7 @@
       | RANGE_1                | 06 January 2023 | 07 January 2023 |
     Then Admin checks that last closed business date of loan is "null"
 
-  @TestRailId:C2604
+
   Scenario: Verify that LoanCOBApiFilter works fine in the background and loanId controlled transaction triggers inlineCOB if COB had been applied on loan before
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -116,7 +116,7 @@
       | RANGE_1                | 06 January 2023 | 07 January 2023 |
     Then Admin checks that last closed business date of loan is "06 January 2023"
 
-  @TestRailId:C2605
+
   Scenario: Verify that LoanCOBApiFilter works fine in the background and externalId controlled transaction triggers inlineCOB if COB had been applied on loan before
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature b/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature
index 139754d..93925f9 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature
@@ -1,45 +1,45 @@
 @LoanFeature
 Feature: Loan
 
-  @TestRailId:C16 @Smoke
+   @Smoke
   Scenario: Loan creation functionality in Fineract
     When Admin sets the business date to the actual date
     When Admin creates a client with random data
     When Admin creates a new Loan
 
-  @TestRailId:C17
+
   Scenario: Loan creation functionality in Fineract
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
     And Admin successfully creates a new customised Loan submitted on date: "1 July 2022", with Principal: "5000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
 
-  @TestRailId:C42
+
   Scenario: As a user I would like to see that the loan is not created if the loan submission date is after the business date
     When Admin sets the business date to "25 June 2022"
     When Admin creates a client with random data
     Then Admin fails to create a new customised Loan submitted on date: "1 July 2022", with Principal: "5000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
 
-  @TestRailId:C43
+
   Scenario: As a user I would like to see that the loan is created if the loan submission date is equal to business date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
     And Admin successfully creates a new customised Loan submitted on date: "1 July 2022", with Principal: "5000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
 
-  @TestRailId:C46
+
   Scenario: As a user I would like to see that the loan is approved at the business date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
     And Admin successfully creates a new customised Loan submitted on date: "1 July 2022", with Principal: "5000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
     And Admin successfully approves the loan on "1 July 2022" with "5000" amount and expected disbursement date on "2 July 2022"
 
-  @TestRailId:C30 @single
+   @single
   Scenario: As a user I would like to see that the loan is cannot be approved with future approval date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
     And Admin successfully creates a new customised Loan submitted on date: "1 July 2022", with Principal: "5000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
     Then Admin fails to approve the loan on "2 July 2022" with "5000" amount and expected disbursement date on "2 July 2022" because of wrong date
 
-  @TestRailId:C47 @multi
+   @multi
   Scenario: As a user I would like to see that the loan can be disbursed at the business date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -47,7 +47,7 @@
     And Admin successfully approves the loan on "1 July 2022" with "5000" amount and expected disbursement date on "2 July 2022"
     When Admin successfully disburse the loan on "1 July 2022" with "5000" EUR transaction amount
 
-  @TestRailId:C31
+
   Scenario: As a user I would like to see that the loan is cannot be disbursed with future disburse date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -55,7 +55,7 @@
     And Admin successfully approves the loan on "1 July 2022" with "5000" amount and expected disbursement date on "2 July 2022"
     Then Admin fails to disburse the loan on "2 July 2022" with "5000" EUR transaction amount because of wrong date
 
-  @TestRailId:C64
+
   Scenario: As a user I would like to see that 50% over applied amount can be approved and disbursed on loan correctly
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -63,7 +63,7 @@
     And Admin successfully approves the loan on "1 September 2022" with "1500" amount and expected disbursement date on "1 September 2022"
     When Admin successfully disburse the loan on "1 September 2022" with "1500" EUR transaction amount
 
-  @TestRailId:C65
+
   Scenario: As a user I would like to see that 50% over applied amount can be approved but more than 50% cannot be disbursed on loan
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -71,14 +71,14 @@
     And Admin successfully approves the loan on "1 September 2022" with "1500" amount and expected disbursement date on "1 September 2022"
     Then Admin fails to disburse the loan on "1 September 2022" with "1501" EUR transaction amount because of wrong amount
 
-  @TestRailId:C66
+
   Scenario: As a user I would like to see that more than 50% over applied amount can not be approved on loan
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
     When Admin successfully creates a new customised Loan submitted on date: "1 September 2022", with Principal: "1000", a loanTermFrequency: 3 months, and numberOfRepayments: 3
     Then Admin fails to approve the loan on "1 September 2022" with "1501" amount and expected disbursement date on "1 September 2022" because of wrong amount
 
-  @TestRailId:C2769
+
   Scenario: As a user I would like to see that more than 50% over applied amount in total can not be disbursed on loan
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -87,7 +87,7 @@
     And Admin successfully disburse the loan on "1 September 2022" with "1400" EUR transaction amount
     Then Admin fails to disburse the loan on "1 September 2022" with "101" EUR transaction amount because of wrong amount
 
-  @TestRailId:C67
+
   Scenario: As admin I would like to check that amounts are distributed equally in loan repayment schedule
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -97,7 +97,7 @@
     When Admin successfully disburse the loan on "1 September 2022" with "900" EUR transaction amount
     Then Amounts are distributed equally in loan repayment schedule in case of total amount 900
 
-  @TestRailId:C68
+
   Scenario: As admin I would like to be sure that approval of on loan can be undone
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -105,7 +105,7 @@
     And Admin successfully approves the loan on "1 September 2022" with "1000" amount and expected disbursement date on "1 September 2022"
     Then Admin can successfully undone the loan approval
 
-  @TestRailId:C69
+
   Scenario: As admin I would like to be sure that disbursal of on loan can be undone
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -116,14 +116,14 @@
     Then Admin can successfully undone the loan approval
     And Admin successfully approves the loan on "1 September 2022" with "1000" amount and expected disbursement date on "1 September 2022"
 
-  @TestRailId:C70
+
   Scenario: As admin I would like to be sure that submitted on date can be edited on loan
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
     When Admin creates a new default Loan with date: "1 September 2022"
     Then Admin can successfully modify the loan and changes the submitted on date to "31 August 2022"
 
-  @TestRailId:C2454 @fraud
+   @fraud
   Scenario: As admin I would like to set Fraud flag to a loan
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -132,7 +132,7 @@
     When Admin successfully disburse the loan on "1 September 2022" with "1000" EUR transaction amount
     Then Admin can successfully set Fraud flag to the loan
 
-  @TestRailId:C2455 @fraud
+   @fraud
   Scenario: As admin I would like to unset Fraud flag to a loan
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -143,7 +143,7 @@
     Then Admin can successfully unset Fraud flag to the loan
 
 
-  @TestRailId:C2456 @fraud
+   @fraud
   Scenario: As admin I would like to try to add fraud flag on a not active loan
     When Admin sets the business date to "25 October 2022"
     When Admin creates a client with random data
@@ -151,7 +151,7 @@
     And Admin successfully approves the loan on "25 October 2022" with "1000" amount and expected disbursement date on "25 October 2022"
     Then Admin can successfully unset Fraud flag to the loan
 
-  @TestRailId:C2473 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency APIs can be called with the Idempotency-Key header
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -163,7 +163,7 @@
     Then Loan has 1 "DISBURSEMENT" transactions on Transactions tab
     Then Loan has 1 "REPAYMENT" transactions on Transactions tab
 
-  @TestRailId:C2474 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency APIs can be called without the Idempotency-Key header
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -175,7 +175,7 @@
     Then Loan has 1 "DISBURSEMENT" transactions on Transactions tab
     Then Loan has 1 "REPAYMENT" transactions on Transactions tab
 
-  @TestRailId:C2475 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in a happy path scenario in case of REPAYMENT transaction
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -190,7 +190,7 @@
     Then Transaction response has the correct clientId and the loanId of the first transaction
     Then Loan has 1 "REPAYMENT" transactions on Transactions tab
 
-  @TestRailId:C2476 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in a happy path scenario in case of GOODWILL_CREDIT transaction
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -206,7 +206,7 @@
     Then Transaction response has the correct clientId and the loanId of the first transaction
     Then Loan has 1 "GOODWILL_CREDIT" transactions on Transactions tab
 
-  @TestRailId:C2477 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in a happy path scenario in case of PAYOUT_REFUND transaction
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -221,7 +221,7 @@
     Then Transaction response has the correct clientId and the loanId of the first transaction
     Then Loan has 1 "PAYOUT_REFUND" transactions on Transactions tab
 
-  @TestRailId:C2478 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in a happy path scenario in case of MERCHANT_ISSUED_REFUND transaction
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -236,7 +236,7 @@
     Then Transaction response has the correct clientId and the loanId of the first transaction
     Then Loan has 1 "MERCHANT_ISSUED_REFUND" transactions on Transactions tab
 
-  @TestRailId:C2482 @idempotency
+   @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in case of client calls the same idempotency key on a second loan
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -256,7 +256,7 @@
     Then Second loan has 0 "REPAYMENT" transactions on Transactions tab
 
 #  TODO it will fail until different client can see each other cached response with same idempotent key is fixed
-  @Skip @TestRailId:C2483 @idempotency
+  @Skip  @idempotency
   Scenario: As admin I would like to verify that idempotency applies correctly in case of a second client calls the same idempotency key on a second loan
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -276,7 +276,7 @@
     Then Loan has 1 "REPAYMENT" transactions on Transactions tab
     Then Second loan has 1 "REPAYMENT" transactions on Transactions tab
 
-  @TestRailId:C2479
+
   Scenario: As admin I would like to be sure that goodwill credit transaction is working properly
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -288,7 +288,7 @@
     When Customer makes "GOODWILL_CREDIT" transaction with "AUTOPAY" payment type on "15 November 2022" with 200 EUR transaction amount and self-generated Idempotency key
     Then Loan has 1 "GOODWILL_CREDIT" transactions on Transactions tab
 
-  @TestRailId:C2480
+
   Scenario: As admin I would like to be sure that payout refund transaction is working properly
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -300,7 +300,7 @@
     When Customer makes "PAYOUT_REFUND" transaction with "AUTOPAY" payment type on "15 November 2022" with 200 EUR transaction amount and self-generated Idempotency key
     Then Loan has 1 "PAYOUT_REFUND" transactions on Transactions tab
 
-  @TestRailId:C2481
+
   Scenario: As admin I would like to be sure that  merchant issued refund transaction is working properly
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -312,7 +312,7 @@
     When Customer makes "MERCHANT_ISSUED_REFUND" transaction with "AUTOPAY" payment type on "15 November 2022" with 200 EUR transaction amount and self-generated Idempotency key
     Then Loan has 1 "MERCHANT_ISSUED_REFUND" transactions on Transactions tab
 
-  @TestRailId:C2488
+
   Scenario: As admin I would like to be sure that no multiple status change event got raised during transaction replaying
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -333,7 +333,7 @@
     When Customer undo "1"th repayment on "4 November 2022"
     Then Loan status has changed to "Active"
 
-  @TestRailId:C2489
+
   Scenario: As admin I would like to charge-off a loan and be sure the event was triggered
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -346,7 +346,7 @@
     And Admin does charge-off the loan on "3 November 2022"
     Then Loan marked as charged-off on "03 November 2022"
 
-  @TestRailId:C2491
+
   Scenario: As a user I would like to do multiple repayment, overpay the loan and reverse-replaying transactions and check outstanding balance
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -400,7 +400,7 @@
     And Customer makes "AUTOPAY" repayment on "02 November 2022" with 500 EUR transaction amount
     Then Loan has 290 overpaid amount
 
-  @TestRailId:C2502
+
   Scenario: Verify that Loan status goes from active to overpaid in case of Goodwill credit transaction when transaction amount is greater than balance
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -435,7 +435,7 @@
       | LIABILITY | l1           | Overpayment account      |       | 100.0  |
       | EXPENSE   | 744003       | Goodwill Expense Account | 400.0 |        |
 
-  @TestRailId:C2503
+
   Scenario: Verify that Loan status goes from active to overpaid in case of Backdated 3rd repayment when transaction amount is greater than balance
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -471,7 +471,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
 
-  @TestRailId:C2504
+
   Scenario: Verify that Loan status goes from overpaid to active in case of Chargeback transaction when transaction amount is greater than overpaid amount
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -512,7 +512,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 300.0  |
       | LIABILITY | l1           | Overpayment account       | 200.0 |        |
 
-  @TestRailId:C2506
+
   Scenario: Verify that Loan status goes from overpaid to active in case of 1st repayment is undone
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -549,7 +549,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 300.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 300.0 |        |
 
-  @TestRailId:C2507
+
   Scenario: Verify that Loan status goes from active to closed in case of Goodwill credit transaction when transaction amount equals balance
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -582,7 +582,7 @@
       | ASSET   | 112601       | Loans Receivable         |       | 300.0  |
       | EXPENSE | 744003       | Goodwill Expense Account | 300.0 |        |
 
-  @TestRailId:C2508
+
   Scenario: Verify that Loan status goes from active to closed in case of Backdated 3rd repayment when transaction amount equals balance
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -615,7 +615,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 250.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
-  @TestRailId:C2509
+
   Scenario: Verify that Loan status goes from closed to overpaid in case of Goodwill credit transaction
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -656,7 +656,7 @@
       | EXPENSE   | 744003       | Goodwill Expense Account | 100.0 |        |
 
 
-  @TestRailId:C2510
+
   Scenario: Verify that Loan status goes from overpaid to closed in case of Chargeback transaction when transaction amount equals overpaid amount
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -697,7 +697,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
 
-  @TestRailId:C2512
+
   Scenario: Verify that Loan status goes from overpaid to closed in case of 1st repayment is undone
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -734,7 +734,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 300.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 300.0 |        |
 
-  @TestRailId:C2513
+
   Scenario: Verify that Loan status goes from closed to active in case of Chargeback transaction
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -773,7 +773,7 @@
       | ASSET     | 112601       | Loans Receivable          | 200.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2514
+
   Scenario: Verify that Loan status goes from closed to active in case of 1st repayment is undone
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -811,7 +811,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account | 200.0 |        |
 
 
-  @TestRailId:C2539
+
   Scenario: Verify that loan overdue calculation is updated upon Goodwill credit transaction
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -828,7 +828,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2540
+
   Scenario: Verify that loan overdue calculation is updated upon Payout refund transaction
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -845,7 +845,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2541
+
   Scenario: Verify that loan overdue calculation is updated upon Merchant issued refund transaction
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -862,7 +862,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2552
+
   Scenario: Verify that delinquency event contains the correct delinquentDate in case of one repayment is overdue
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -873,7 +873,7 @@
     When Admin runs inline COB job for Loan
     Then Admin checks that delinquency range is: "RANGE_3" and has delinquentDate "2023-02-03"
 
-  @TestRailId:C2553
+
   Scenario: Verify that delinquency event contains the correct delinquentDate in case of multiple repayments are overdue
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -886,7 +886,7 @@
     When Admin runs inline COB job for Loan
     Then Admin checks that delinquency range is: "RANGE_30" and has delinquentDate "2023-02-04"
 
-  @TestRailId:C2583
+
   Scenario: Verify last payment related fields when retrieving loan details with 1 repayment
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -899,7 +899,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 200.0             | 03 January 2023 | 200.0               | 03 January 2023   |
 
-  @TestRailId:C2586
+
   Scenario: Verify last payment related fields when retrieving loan details with 2 repayments on different day
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -914,7 +914,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 300.0             | 05 January 2023 | 300.0               | 05 January 2023   |
 
-  @TestRailId:C2587
+
   Scenario: Verify last payment related fields when retrieving loan details with 2 repayments on the same day
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -928,7 +928,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 300.0             | 03 January 2023 | 300.0               | 03 January 2023   |
 
-  @TestRailId:C2588
+
   Scenario: Verify last payment related fields when retrieving loan details with 2 repayments on different day then the second repayment reversed
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -947,7 +947,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 200.0             | 03 January 2023 | 200.0               | 03 January 2023   |
 
-  @TestRailId:C2589
+
   Scenario: Verify last payment related fields when retrieving loan details with 1 repayment and 1 goodwill credit transaction
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -962,7 +962,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 400.0             | 05 January 2023 | 200.0               | 03 January 2023   |
 
-  @TestRailId:C2590
+
   Scenario: Verify last payment related fields when retrieving loan details with 1 repayment, 1 goodwill credit transaction and 1 more repayment then the second repayment reversed
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -983,7 +983,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 400.0             | 05 January 2023 | 200.0               | 03 January 2023   |
 
-  @TestRailId:C2678
+
   Scenario: Verify that after loan is closed loan details and event has last repayment date and amount
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -999,7 +999,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 1000.0            | 02 January 2023 | 1000.0              | 02 January 2023   |
 
-  @TestRailId:C2679
+
   Scenario: Verify that after loan is overpaid loan details and event has last repayment date and amount
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1015,7 +1015,7 @@
       | lastPaymentAmount | lastPaymentDate | lastRepaymentAmount | lastRepaymentDate |
       | 1100.0            | 02 January 2023 | 1100.0              | 02 January 2023   |
 
-  @TestRailId:C2687 @fraud
+   @fraud
   Scenario: Verify that closed loan can be marked as Fraud
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1027,7 +1027,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Admin can successfully set Fraud flag to the loan
 
-  @TestRailId:C2688 @fraud
+   @fraud
   Scenario: Verify that overpaid loan can be marked as Fraud
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1039,7 +1039,7 @@
     Then Loan status will be "OVERPAID"
     Then Admin can successfully set Fraud flag to the loan
 
-  @TestRailId:C2690
+
   Scenario: Verify that the repayment schedule is correct when the loan has a fee and multi disbursement happens
     When Admin sets the business date to "1 May 2023"
     When Admin creates a client with random data
@@ -1065,7 +1065,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1500          | 0        | 8    | 0         | 1508 | 0    | 0          | 0    | 1508        |
 
-  @TestRailId:C2691
+
   Scenario: As an admin I would like to do a chargeback for Goodwill Credit
     When Admin sets the business date to "8 May 2023"
     And Admin creates a client with random data
@@ -1093,7 +1093,7 @@
       | 09 May 2023      | Goodwill Credit  | 300.0  | 300.0     | 0.0      | 0.0  | 0.0       | 700.0        |
       | 10 May 2023      | Chargeback       | 300.0  | 300.0     | 0.0      | 0.0  | 0.0       | 1000.0       |
 
-  @TestRailId:C2692
+
   Scenario: As an admin I would like to do a chargeback for Payout Refund
     When Admin sets the business date to "8 May 2023"
     And Admin creates a client with random data
@@ -1121,7 +1121,7 @@
       | 09 May 2023      | Payout Refund    | 300.0  | 300.0     | 0.0      | 0.0  | 0.0       | 700.0        |
       | 10 May 2023      | Chargeback       | 300.0  | 300.0     | 0.0      | 0.0  | 0.0       | 1000.0       |
 
-  @TestRailId:C2693
+
   Scenario: As an admin I would like to do a chargeback for Merchant Issued Refund
     When Admin sets the business date to "8 May 2023"
     And Admin creates a client with random data
@@ -1149,7 +1149,7 @@
       | 09 May 2023      | Merchant Issued Refund | 300.0  | 300.0     | 0.0      | 0.0  | 0.0       | 700.0        |
       | 10 May 2023      | Chargeback             | 300.0  | 300.0     | 0.0      | 0.0  | 0.0       | 1000.0       |
 
-  @TestRailId:C2770
+
   Scenario: As an admin I would like to do two merchant issued refund and charge adjustment to close the loan
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "14 May 2023"
@@ -1220,7 +1220,7 @@
       | 17 June 2023     | Merchant Issued Refund | 2.95   | 0.0       | 0.0      | 2.95 | 0.0       | 0.0          |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2776
+
   Scenario: Verify that maturity date is updated on repayment reversal
     When Admin sets the business date to "01 June 2023"
     When Admin creates a client with random data
@@ -1244,21 +1244,21 @@
       | actualMaturityDate | expectedMaturityDate |
       | 01 July 2023       | 01 July 2023         |
 
-  @TestRailId:C2777
+
   Scenario: As an admin I would like to delete a loan using external id
     When Admin sets the business date to the actual date
     And Admin creates a client with random data
     When Admin creates a new Loan
     Then Admin successfully deletes the loan with external id
 
-  @TestRailId:C2778
+
   Scenario: As an admin I would like to verify that deleting loan using incorrect external id gives error
     When Admin sets the business date to the actual date
     And Admin creates a client with random data
     When Admin creates a new Loan
     Then Admin fails to delete the loan with incorrect external id
 
-  @TestRailId:C2784
+
   Scenario: As a user I would like to do multiple repayment after reverse transactions and check the order of transactions
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1291,7 +1291,7 @@
       | Repayment        | 8.0    | 0.0       | 0.0      | 0.0  | 8.0       | 1000.0       |
       | Repayment        | 7.0    | 0.0       | 0.0      | 0.0  | 7.0       | 1000.0       |
 
-  @TestRailId:C2783
+
   Scenario: As an admin I would like to verify that only one active repayment schedule exits for loan multiple disbursement
     When Admin sets the business date to "07 July 2023"
     And Admin creates a client with random data
@@ -1346,7 +1346,7 @@
       | 21 July 2023     | Merchant Issued Refund | 167.4  | 162.25    | 0.0      | 5.15 | 0.0       | 208.3        |
       | 24 July 2023     | Disbursement           | 18.0   | 0.0       | 0.0      | 0.0  | 0.0       | 226.3        |
 
-  @TestRailId:C2842 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that simple payments are working with advanced payment allocation (UC1)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -1428,7 +1428,7 @@
       | 15 February 2023 | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2843 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that simple payments and overpayment of the installment (goes to next installment) are working with advanced payment allocation (UC2)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -1510,7 +1510,7 @@
       | 15 February 2023 | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2844 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that simple payments and overpayment of the installment (goes to last installment) are working with advanced payment allocation (UC3)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -1592,7 +1592,7 @@
       | 15 February 2023 | Goodwill Credit  | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2845 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that simple payments are working after some of them failed with advanced payment allocation (UC4)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -1725,7 +1725,7 @@
       | 15 February 2023 | Repayment        | 360.0  | 360.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2846 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that Merchant issued refund with reamortization works with advanced payment allocation (UC05)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -1803,7 +1803,7 @@
       | 16 January 2023  | Repayment              | 201.0  | 200.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    | 1.0         |
     Then Loan status has changed to "Overpaid"
 
-  @TestRailId:C2847 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that Merchant issued refund with reamortization on due date works with advanced payment allocation (UC07)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -1905,7 +1905,7 @@
       | 15 February 2023 | Repayment              | 25.0   | 25.0      | 0.0      | 0.0  | 0.0       | 0.0          |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2848 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that Merchant issued refund with reamortization past due date works with advanced payment allocation (UC08)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -2038,7 +2038,7 @@
       | 15 February 2023 | Repayment              | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2849 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that full refund with CBR (UC17)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -2102,7 +2102,7 @@
       | 09 January 2023  | Credit Balance Refund  | 125.0  | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2850 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that reverse-replay works with advanced payment allocation(UC24)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -2285,7 +2285,7 @@
       | 15 February 2023 | Repayment              | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          | 0.0         | false    |
     Then Loan status has changed to "Closed (obligations met)"
 
-  @TestRailId:C2851 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that reamortization works with uneven balances with advanced payment allocation(UC25)
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -2381,7 +2381,7 @@
       | 04 January 2023  | Repayment              | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 50.0         | false    |
       | 06 January 2023  | Merchant Issued Refund | 40.0   | 40.0      | 0.0      | 0.0  | 0.0       | 10.0         | false    |
 
-  @TestRailId:C2860 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: NEXT_INSTALLMENT
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2424,7 +2424,7 @@
       | 16 September 2023 | Repayment        | 150.0  | 150.0     | 0.0      | 0.0  | 0.0       | 150.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2861 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: LAST_INSTALLMENT, payment on due date
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2467,7 +2467,7 @@
       | 16 September 2023 | Repayment        | 150.0  | 150.0     | 0.0      | 0.0  | 0.0       | 150.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2862 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: LAST_INSTALLMENT, payment before due date
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2510,7 +2510,7 @@
       | 10 September 2023 | Repayment        | 150.0  | 150.0     | 0.0      | 0.0  | 0.0       | 150.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2863 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: REAMORTIZATION, payment on due date
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2553,7 +2553,7 @@
       | 16 September 2023 | Repayment        | 150.0  | 150.0     | 0.0      | 0.0  | 0.0       | 150.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2864 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: REAMORTIZATION, payment before due date
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2596,7 +2596,7 @@
       | 10 September 2023 | Repayment        | 150.0  | 150.0     | 0.0      | 0.0  | 0.0       | 150.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2865 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: REAMORTIZATION, partial payment due date, payment before next due date
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2657,7 +2657,7 @@
       | 20 September 2023 | Repayment        | 180.0  | 180.0     | 0.0      | 0.0  | 0.0       | 40.0         |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2897 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation - future installments: LAST_INSTALLMENT, payment after due date
     When Admin sets the business date to "01 September 2023"
     And Admin creates a client with random data
@@ -2700,7 +2700,7 @@
       | 20 September 2023 | Repayment        | 150.0  | 150.0     | 0.0      | 0.0  | 0.0       | 150.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2922
+
   @ProgressiveLoanSchedule
   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation with progressive loan schedule with multi disbursement and with overpaid installment
@@ -2788,7 +2788,7 @@
       | 12 June 2023     | Disbursement     | 250.0  | 0.0       | 0.0      | 0.0  | 0.0       | 850.0        |
     When Admin set "PIN4_DOWNPAYMENT_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2937
+
   @ProgressiveLoanSchedule
   @AdvancedPaymentAllocation
   Scenario: Verify advanced payment allocation with progressive loan schedule with multi disbursement and reschedule
@@ -2899,7 +2899,7 @@
       | 15 July 2023     | Disbursement     | 250.0  | 0.0       | 0.0      | 0.0  | 0.0       | 850.0        |
     When Admin set "PIN4_DOWNPAYMENT_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C2940 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, loan fully paid in advance
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -2964,7 +2964,7 @@
       | Name    | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | NSF fee | true      | Specified due date | 17 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2941 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, loan fully paid in advance
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3029,7 +3029,7 @@
       | Name    | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | NSF fee | true      | Specified due date | 17 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2942 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, loan overpaid in advance
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3095,7 +3095,7 @@
       | Name    | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | NSF fee | true      | Specified due date | 17 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2943 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, loan overpaid in advance
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3161,7 +3161,7 @@
       | Name    | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | NSF fee | true      | Specified due date | 17 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2944 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, in advanced repayment (future installment type: NEXT_INSTALLMENT)
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3275,7 +3275,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2945 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, in advanced repayment (future installment type: NEXT_INSTALLMENT)
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3389,7 +3389,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2946 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, late Goodwill credit transaction (future installment type: LAST_INSTALLMENT) - amount < past due charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3503,7 +3503,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
 
-  @TestRailId:C2947 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, late Goodwill credit transaction (future installment type: LAST_INSTALLMENT) - amount < past due charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3617,7 +3617,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
 
-  @TestRailId:C2948 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, late Goodwill credit transaction (future installment type: LAST_INSTALLMENT) - amount > first past due charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3731,7 +3731,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2949 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, late Goodwill credit transaction (future installment type: LAST_INSTALLMENT) - amount > first past due charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3845,7 +3845,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2950 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, late Goodwill credit transaction (future installment type: LAST_INSTALLMENT) - amount > sum past due charges
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3959,7 +3959,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2951 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, late Goodwill credit transaction (future installment type: LAST_INSTALLMENT) - amount > sum past due charges
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4073,7 +4073,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2952 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, in advanced Goodwill credit transaction on first charge due date (future installment type: LAST_INSTALLMENT) - amount > due date charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4187,7 +4187,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2953 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, in advanced Goodwill credit transaction on first charge due date (future installment type: LAST_INSTALLMENT) - amount > due date charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4301,7 +4301,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2954 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, in advanced Goodwill credit transaction before first charge due date (future installment type: LAST_INSTALLMENT) - amount > first and second charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4415,7 +4415,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2955 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, in advanced Goodwill credit transaction before first charge due date (future installment type: LAST_INSTALLMENT) - amount > first and second charge
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4529,7 +4529,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 15.0 | 0.0    | 5.0         |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2956 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, in advanced Merchant issued refund transaction on first charge due date (future installment type: REAMORTIZATION) - amount < sum all charges
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4643,7 +4643,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
 
-  @TestRailId:C2957 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, in advanced Merchant issued refund transaction on first charge due date (future installment type: REAMORTIZATION) - amount < sum all charges
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4757,7 +4757,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
 
-  @TestRailId:C2958 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-horizontal, charge after maturity, in advanced Merchant issued refund transaction before first charge due date (future installment type: REAMORTIZATION) - amount < sum all charges
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4871,7 +4871,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
 
-  @TestRailId:C2959 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify AdvancedPaymentAllocation behaviour: loanScheduleProcessingType-vertical, charge after maturity, in advanced Merchant issued refund transaction before first charge due date (future installment type: REAMORTIZATION) - amount < sum all charges
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -4985,7 +4985,7 @@
       | NSF fee | true      | Specified due date | 16 October 2023   | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
       | NSF fee | true      | Specified due date | 17 September 2023 | Flat             | 20.0 | 10.0 | 0.0    | 10.0        |
 
-  @TestRailId:C2960 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that rounding in case of multiple installments works properly
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -5007,7 +5007,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 0.0  | 0.0        | 0.0  | 1000.0      |
 
-  @TestRailId:C2976 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify that disbursement amount only distributed only to future installments (2nd and 3rd installments)
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -5053,7 +5053,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1400.0        | 0.0      | 50.0 | 0.0       | 1450.0 | 250.0 | 0.0        | 0.0  | 1200.0      |
 
-  @TestRailId:C2977 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify that disbursement amount only distributed only to future installments (1st, 2nd and 3rd installments)
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -5098,7 +5098,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1400.0        | 0.0      | 50.0 | 0.0       | 1450.0 | 250.0 | 0.0        | 0.0  | 1200.0      |
 
-  @TestRailId:C2978 @AdvancedPaymentAllocation @ProgressiveLoanSchedule
+   @AdvancedPaymentAllocation @ProgressiveLoanSchedule
   Scenario: Verify that multiple disbursement amount only distributed only to future installments (2nd and 3rd installments)
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -5147,7 +5147,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1480.0        | 0.0      | 50.0 | 0.0       | 1530.0 | 250.0 | 0.0        | 0.0  | 1280.0      |
 
-  @TestRailId:C2986 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: As an admin I would like to verify that refund is working with advanced payment allocation
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
     When Admin sets the business date to "01 January 2023"
@@ -5213,7 +5213,7 @@
       | 16 January 2023  | Repayment        | 315.0  | 255.0     | 0.0      | 60.0 | 0.0       |
       | 17 January 2023  | Refund           | 150.0  | 130.0     | 0.0      | 20.0 | 0.0       |
 
-  @TestRailId:C3042 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that second disbursement is working on overpaid accounts in case of NEXT_INSTALLMENT future installment allocation rule
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -5250,7 +5250,7 @@
       | 16 January 2024  | Disbursement     | 500.0  | 0.0       | 0.0      | 0.0  | 0.0       | 375.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C3043 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that second disbursement is working on overpaid accounts in case of REAMORTIZATION future installment allocation rule
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -5287,7 +5287,7 @@
       | 16 January 2024  | Disbursement     | 500.0  | 0.0       | 0.0      | 0.0  | 0.0       | 375.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C3046 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that principal due is correct in case of second disbursement on overpaid loan
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -5322,7 +5322,7 @@
       | 02 February 2024 | Disbursement     | 160.0  | 0.0       | 0.0      | 0.0  | 0.0       | 110.0        |
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C3049 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that second disbursement on overpaid loan is correct when disbursement amount is lower than overpayment amount
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -5359,7 +5359,7 @@
     Then Loan has 22 overpaid amount
     When Admin set "PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
 
-  @TestRailId:C3068 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Fraud flag can be applied on loan is its every status
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -5395,7 +5395,7 @@
     Then Admin can successfully set Fraud flag to the loan
     Then Admin can successfully unset Fraud flag to the loan
 
-  @TestRailId:C3090
+
   Scenario: Verify that disbursement can be done on overpaid loan in case of cummulative loan schedule
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -5485,7 +5485,7 @@
       | 05 February 2024 | Disbursement     | 40.0   | 0.0       | 0.0      | 0.0  | 0.0       | 40.0         |
       | 05 February 2024 | Down Payment     | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 30.0         |
 
-  @TestRailId:C3103
+
   Scenario: Verify that fixed length in loan product is inherited by loan account
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -5497,7 +5497,7 @@
     When Admin successfully disburse the loan on "01 February 2024" with "1000" EUR transaction amount
     Then LoanDetails has fixedLength field with int value: 90
 
-  @TestRailId:C3104
+
   Scenario: Verify that fixed legnth in loan product can be overwrote upon loan account creation
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualTransaction.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualTransaction.feature
index 945f9d8..2b125fd 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualTransaction.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualTransaction.feature
@@ -1,7 +1,7 @@
 @LoanAccrualFeature
 Feature: LoanAccrualTransaction
 
-  @TestRailId:C2647
+
   Scenario: Verify that after COB job Accrual event is raised when loan has a fee-charge on disbursal date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -16,7 +16,7 @@
       | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "01 January 2023"
 
-  @TestRailId:C2648
+
   Scenario: Verify that after COB job Accrual event is raised when loan has a fee-charge on disbursal date with partial repayment
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -32,7 +32,7 @@
       | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "01 January 2023"
 
-  @TestRailId:C2649
+
   Scenario: Verify that after COB job Accrual event is raised when loan has a fee-charge on disbursal date with full repayment and loan is closed
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -48,7 +48,7 @@
       | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "02 January 2023"
 
-  @TestRailId:C2650
+
   Scenario: Verify that after COB job Accrual event is raised when loan has a fee-charge added with chargeback
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -72,7 +72,7 @@
       | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "05 January 2023"
 
-  @TestRailId:C2651
+
   Scenario: Verify that after periodic accrual transaction job accrual event is raised when loan has a fee-charge added with waive charge and undo waive charge
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -100,7 +100,7 @@
       | Accrual          | 10.0   | 0.0       | 0.0      | 0.0 | 10.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "05 April 2023"
 
-  @TestRailId:C2652
+
   Scenario: Verify that after periodic accrual transaction job accrual event is raised when loan has a fee-charge added when loan is closed
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -117,7 +117,7 @@
       | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "02 January 2023"
 
-  @TestRailId:C2653
+
   Scenario: Verify that after disbursement and COB job Accrual event is raised when loan has a interest recalculation
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -133,7 +133,7 @@
       | Accrual          | 1.64   | 0.0       | 1.64     | 0.0  | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "02 January 2023"
 
-  @TestRailId:C2654
+
   Scenario: Verify that after loan is closed accrual event is raised when loan has a interest recalculation
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -150,7 +150,7 @@
       | Accrual          | 10.19  | 0.0       | 10.19    | 0.0  | 0.0       | 0.0          |
     Then LoanAccrualTransactionCreatedBusinessEvent is raised on "02 January 2023"
 
-  @TestRailId:C2683
+
   Scenario: Verify that the final accrual is created when the loan goes to overpaid state
     When Admin sets the business date to "1 July 2023"
     When Admin creates a client with random data
@@ -174,7 +174,7 @@
       | 06 July 2023     | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
       | 06 July 2023     | Repayment        | 5011.0 | 5000.0    | 0.0      | 10.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2684
+
   Scenario: Verify that the accrual transaction correctly created in case a CBR is applied on the loan
     When Admin sets the business date to "1 July 2023"
     When Admin creates a client with random data
@@ -213,7 +213,7 @@
       | 06 July 2023     | Repayment             | 5011.0 | 5000.0    | 0.0      | 10.0 | 0.0       | 0.0          |
       | 06 July 2023     | Credit Balance Refund | 1.0    | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2685
+
   Scenario: Verify that the accrual transaction correctly created (overpay, undo repayment, overpay)
     When Admin sets the business date to "1 July 2023"
     When Admin creates a client with random data
@@ -259,7 +259,7 @@
       | 06 July 2023     | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
       | 07 July 2023     | Repayment        | 4011.0 | 4010.0    | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2686
+
   Scenario: Verify that the accrual transaction correctly created (overpay, undo repayment, add charge, overpay)
     When Admin sets the business date to "1 July 2023"
     When Admin creates a client with random data
@@ -307,7 +307,7 @@
       | 07 July 2023     | Repayment        | 4061.0 | 4060.0    | 0.0      | 0.0  | 0.0       | 0.0          |
       | 07 July 2023     | Accrual          | 50.0   | 0.0       | 0.0      | 50.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2707 @Skip
+   @Skip
   Scenario: Verify that the accrual transaction is not reversed when multi disbursement happens
     When Admin sets the business date to "26 April 2023"
     When Admin creates a client with random data
@@ -339,7 +339,7 @@
       | 27 April 2023    | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
       | 28 April 2023    | Disbursement     | 20.0   | 0.0       | 0.0      | 0.0  | 0.0       | 1050.0       |
 
-  @TestRailId:C2708 @Skip
+   @Skip
   Scenario: Verify that the accrual is correct when it is on the installment start date
     When Admin sets the business date to "1 May 2023"
     When Admin creates a client with random data
@@ -366,7 +366,7 @@
       | 01 May 2023      | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
       | 08 May 2023      | Disbursement     | 20.0   | 0.0       | 0.0      | 0.0  | 0.0       | 1020.0       |
 
-  @TestRailId:C2709
+
   Scenario:Verify that the accrual transaction is created for disbursement fee
     When Admin sets the business date to "1 May 2023"
     When Admin creates a client with random data
@@ -380,7 +380,7 @@
       | 01 May 2023      | Repayment (at time of disbursement) | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 1000.0       |
       | 01 May 2023      | Accrual                             | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2710 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: single installment loan, charge-accrual-date = submitted-date, multiple charges with different submitted date
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -409,7 +409,7 @@
       | 1000          | 0        | 20   | 0         | 1020 | 0    | 0          | 0    | 1020        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2711
+
   Scenario: Verify global config charge-accrual-date function: single installment loan, charge-accrual-date = due-date, multiple charges with different submitted date
     When Global config "charge-accrual-date" value set to "due-date"
     When Admin sets the business date to "01 February 2023"
@@ -441,7 +441,7 @@
       | 1000          | 0        | 20   | 0         | 1020 | 0    | 0          | 0    | 1020        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2712 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = submitted-date, multiple charges with different submitted date, due dates in same repayment period
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -474,7 +474,7 @@
       | 3000          | 0        | 20   | 0         | 3020 | 0    | 0          | 0    | 3020        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2713
+
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = due-date, multiple charges with different submitted date, due dates in same repayment period
     When Global config "charge-accrual-date" value set to "due-date"
     When Admin sets the business date to "01 February 2023"
@@ -510,7 +510,7 @@
       | 3000          | 0        | 20   | 0         | 3020 | 0    | 0          | 0    | 3020        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2714 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = submitted-date, multiple charges with different submitted date, due dates in different repayment periods
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -544,7 +544,7 @@
       | 3000          | 0        | 20   | 0         | 3020 | 0    | 0          | 0    | 3020        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2715
+
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = due-date, multiple charges with different submitted date, due dates in different repayment periods
     When Global config "charge-accrual-date" value set to "due-date"
     When Admin sets the business date to "01 February 2023"
@@ -580,7 +580,7 @@
       | 3000          | 0        | 20   | 0         | 3020 | 0    | 0          | 0    | 3020        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2716 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: single installment loan, charge-accrual-date = submitted-date, multi disbursement
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -612,7 +612,7 @@
       | 1000          | 0        | 10   | 0         | 1010 | 0    | 0          | 0    | 1010        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2717 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: single installment loan, charge-accrual-date = submitted-date, repayment reversal
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -649,7 +649,7 @@
       | 1000          | 0        | 10   | 0         | 1010 | 0    | 0          | 0    | 1010        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2718 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: single installment loan, charge-accrual-date = submitted-date, waive charge, undo waive
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -686,7 +686,7 @@
       | 1000          | 0        | 10   | 0         | 1010 | 0    | 0          | 0    | 1010        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2719 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = submitted-date, multi disbursement
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -722,7 +722,7 @@
       | 3000          | 0        | 10   | 0         | 3010 | 0    | 0          | 0    | 3010        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2720 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = submitted-date, repayment reversal
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -763,7 +763,7 @@
       | 3000          | 0        | 10   | 0         | 3010 | 0    | 0          | 0    | 3010        |
     When Global config "charge-accrual-date" value set to "due-date"
 
-  @TestRailId:C2721 @Specific
+   @Specific
   Scenario: Verify global config charge-accrual-date function: multiple installment loan, charge-accrual-date = submitted-date, waive charge, undo waive
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "01 February 2023"
@@ -805,7 +805,7 @@
     When Global config "charge-accrual-date" value set to "due-date"
 
 
-  @TestRailId:C2789 @Specific
+   @Specific
   Scenario: Verify accrual transaction for new fee for loan with accrued snooze fee and schedule adjustment
     When Global config "charge-accrual-date" value set to "submitted-date"
     When Admin sets the business date to "19 May 2023"
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanCBR.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanCBR.feature
index 6445e8e..7b5c765 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanCBR.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanCBR.feature
@@ -1,7 +1,7 @@
 @LoanCBR
 Feature: Credit Balance Refund
 
-  @TestRailId:C2505
+
   Scenario: Verify that Loan status goes from overpaid to active in case of CBR transaction (with replaying when CBR>new balance → clears overpaid, remaining increasing loan balance)
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -48,7 +48,7 @@
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2511
+
   Scenario: Verify that Loan status goes from overpaid to closed in case of CBR transaction when transaction amount equals overpaid amount
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -88,7 +88,7 @@
       | LIABILITY | l1           | Overpayment account       | 200.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2515
+
   Scenario: Single repayment reversal
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -122,7 +122,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
 
-  @TestRailId:C2516
+
   Scenario: Multi repayment reversal
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -161,7 +161,7 @@
       | ASSET     | 112601       | Loans Receivable          | 200.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2517
+
   Scenario: Overpaid paid portion
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -202,7 +202,7 @@
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2518
+
   Scenario: Repayment reversal
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -241,7 +241,7 @@
       | ASSET     | 112601       | Loans Receivable          | 1000.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |        | 1000.0 |
 
-  @TestRailId:C2519
+
   Scenario: Refund reversal
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -280,7 +280,7 @@
       | ASSET     | 112601       | Loans Receivable          | 1000.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |        | 1000.0 |
 
-  @TestRailId:C2520
+
   Scenario: Partial refund reversal
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -319,7 +319,7 @@
       | ASSET     | 112601       | Loans Receivable          | 500.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 500.0  |
 
-  @TestRailId:C2521
+
   Scenario: Chargeback after CBR
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -368,7 +368,7 @@
       | ASSET     | 112601       | Loans Receivable          | 500.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 500.0  |
 
-  @TestRailId:C2522
+
   Scenario: Refund after CBR scenario
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -422,7 +422,7 @@
       | ASSET     | 112601       | Loans Receivable          | 500.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 500.0  |
 
-  @TestRailId:C2523
+
   Scenario: Single repayment reversal (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -455,7 +455,7 @@
       | ASSET     | 112601       | Loans Receivable          | 200.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2524
+
   Scenario: Multi repayment reversal (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -494,7 +494,7 @@
       | ASSET     | 112601       | Loans Receivable          | 200.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2525
+
   Scenario: Overpaid paid portion (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -535,7 +535,7 @@
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2526
+
   Scenario: Repayment reversal (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -574,7 +574,7 @@
       | ASSET     | 112601       | Loans Receivable          | 1000.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |        | 1000.0 |
 
-  @TestRailId:C2527
+
   Scenario: Refund reversal (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -613,7 +613,7 @@
       | ASSET     | 112601       | Loans Receivable          | 1000.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |        | 1000.0 |
 
-  @TestRailId:C2528
+
   Scenario: Partial refund reversal (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -652,7 +652,7 @@
       | ASSET     | 112601       | Loans Receivable          | 500.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 500.0  |
 
-  @TestRailId:C2529
+
   Scenario: Chargeback after CBR (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -701,7 +701,7 @@
       | ASSET     | 112601       | Loans Receivable          | 500.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 500.0  |
 
-  @TestRailId:C2530
+
   Scenario: Refund after CBR scenario (after maturity)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -755,7 +755,7 @@
       | ASSET     | 112601       | Loans Receivable          | 500.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 500.0  |
 
-  @TestRailId:C2841
+
   Scenario: Verify that accruals created for charges after CBR post-maturity
     When Admin sets the business date to "01 July 2023"
     And Admin creates a client with random data
@@ -804,7 +804,7 @@
       | 02 August 2023   | Credit Balance Refund  | 200.0  | 10.0      | 0.0      | 0.0  | 0.0       | 10.0         |
       | 03 August 2023   | Accrual                | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2885
+
   Scenario: Verify that Loan status goes from overpaid to active in case of CBR transaction (with replaying when CBR>new balance → clears overpaid, remaining increasing loan balance) - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION loan product
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -875,7 +875,7 @@
       | ASSET     | 112601       | Loans Receivable          | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
 
-  @TestRailId:C2886
+
   Scenario: Verify that Loan status goes from overpaid to closed in case of CBR transaction when transaction amount equals overpaid amount - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION loan product
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -941,7 +941,7 @@
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
 
-  @TestRailId:C2887
+
   Scenario: Verify that Loan status goes from overpaid to active in case of Refund transaction was reverted - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION loan product
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1018,7 +1018,7 @@
       | ASSET     | 112601       | Loans Receivable          | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
 
-  @TestRailId:C2888
+
   Scenario: Multi repayment reversal (after maturity) - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION loan product
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1091,7 +1091,7 @@
       | ASSET     | 112601       | Loans Receivable          | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
 
-  @TestRailId:C2889
+
   Scenario: Verify that Loan status goes from overpaid to active in case of CBR transaction (after maturity) - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION loan product
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1170,7 +1170,7 @@
       | ASSET     | 112601       | Loans Receivable          | 100.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
 
-  @TestRailId:C2890
+
   Scenario: Verify that accruals created for charges after CBR post-maturity - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION loan product
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1240,7 +1240,7 @@
       | 18 October 2023   | Credit Balance Refund  | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
       | 19 October 2023   | Accrual                | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2989
+
   Scenario: Verify that CBR transaction date cannot be in the future
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1258,7 +1258,7 @@
     When Admin sets the business date to "15 September 2023"
     Then Credit Balance Refund transaction on future date "20 September 2023" with 250 EUR transaction amount will result an error
 
-  @TestRailId:C3020
+
   Scenario: Verify that Charge-off and CBR transaction GL entries are correct in case of repayment reversal after CBR and Fraud flagged loan
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -1305,7 +1305,7 @@
       | EXPENSE   | 744037       | Credit Loss/Bad Debt-Fraud | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account  |       | 250.0  |
 
-  @TestRailId:C3021
+
   Scenario: Verify that Charge-off and CBR transaction GL entries are correct in case of repayment reversal after CBR and Non-Fraud loan
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -1351,7 +1351,7 @@
       | EXPENSE   | 744007       | Credit Loss/Bad Debt      | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
-  @TestRailId:C3040
+
   Scenario: Verify that Charge-off and CBR transaction GL entries are correct before and after a repayment reversal taken place after CBR - UC1
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -1425,7 +1425,7 @@
       | LIABILITY | l1           | Overpayment account       | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 350.0  |
 
-  @TestRailId:C3041
+
   Scenario: Verify that Charge-off and CBR transaction GL entries are correct before and after a repayment reversal taken place after CBR - UC2
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -1494,7 +1494,7 @@
       | EXPENSE   | 744007       | Credit Loss/Bad Debt      | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
-  @TestRailId:C3092
+
   Scenario: Verify that overpayment portion calculated properly in case of CBR reverse-replay
     When Admin sets the business date to "25 January 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanCharge.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanCharge.feature
index e685d34..9938c7c 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanCharge.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanCharge.feature
@@ -1,21 +1,21 @@
 @ChargeFeature
 Feature: LoanCharge
 
-  @TestRailId:C50
+
   Scenario: Charge creation functionality with locale EN
     When Admin creates a client with random data
     When Admin successfully creates a new customised Loan submitted on date: "1 July 2022", with Principal: "6000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
     And Admin adds a 10 % Processing charge to the loan with "en" locale on date: "10 July 2022"
     Then Charge is successfully added to the loan with 600 EUR
 
-  @TestRailId:C51
+
   Scenario: Charge creation functionality with locale DE
     When Admin creates a client with random data
     When Admin successfully creates a new customised Loan submitted on date: "1 July 2022", with Principal: "6000", a loanTermFrequency: 24 months, and numberOfRepayments: 24
     And Admin adds a 10 % Processing charge to the loan with "de_DE" locale on date: "10 Juli 2022"
     Then Charge is successfully added to the loan with 600 EUR
 
-  @TestRailId:C2450
+
   Scenario: Due date charge can be successfully applied when it is added on the loan account after the maturity date (NSF scenario of last installment)
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -35,7 +35,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2451
+
   Scenario: Due date charge can be successfully applied when it is added on the loan account which already has a N+1 scenario (by chargeback)
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -59,7 +59,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2452
+
   Scenario: Due date charge can be successfully applied, then waived when it is added on the loan account after the maturity date (NSF scenario of last installment)
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -85,7 +85,7 @@
     Then Loan has 250 outstanding amount
 
 
-  @TestRailId:C2453
+
   Scenario: Due date charge can be successfully applied, waived, then waive reversed when it is added on the loan account after the maturity date (NSF scenario of last installment)
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -109,7 +109,7 @@
     Then Loan has 260 outstanding amount
 
 #    TODO clear, make it work properly
-  @Skip @TestRailId:C2472
+  @Skip
   Scenario: Charge adjustment works properly
     When Admin sets the business date to "22 October 2022"
     When Admin creates a client with random data
@@ -375,7 +375,7 @@
 #      | nth Charge | Name       | isPenalty | Due as of       | Due | Paid | Waived | Outstanding |
 #      |            | Snooze fee | false     | 27 October 2022 | 9   | 9    | 0      | 0           |
 
-  @TestRailId:C2532
+
   Scenario: Verify that charge can be added to loan on disbursement date (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -389,7 +389,7 @@
       | Snooze fee | false     | Specified due date | 01 January 2023 | Flat             | 10.0 | 0.0  | 0.0    | 10.0        |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2533
+
   Scenario: Verify that charge can be added to loan after disbursement date (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -404,7 +404,7 @@
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 0.0  | 0.0    | 10.0        |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2534
+
   Scenario: Verify that charge can be added to loan after partial repayment (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -420,7 +420,7 @@
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 10.0 | 0.0    | 0.0         |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2535
+
   Scenario: Verify that charge can be added to loan which is reopened by chargeback transaction after got overpaid by repayment  (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -439,7 +439,7 @@
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 10.0 | 0.0    | 0.0         |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2536
+
   Scenario: Verify that charge can be added to loan which is reopened by payment undo transaction after got overpaid by repayment  (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -460,7 +460,7 @@
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 10.0 | 0.0    | 0.0         |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2537
+
   Scenario: Verify that charge can be added to loan which is reopened by undo goodwill credit transaction after got overpaid by goodwill credit transaction  (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -480,7 +480,7 @@
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 10.0 | 0.0    | 0.0         |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2538
+
   Scenario: Verify that charge can be added to loan which is reopened by undo repayment after got overpaid by goodwill credit transaction  (loan status is 'active')
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -500,7 +500,7 @@
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 10.0 | 0.0    | 0.0         |
     Then Loan's actualMaturityDate is "31 January 2023"
 
-  @TestRailId:C2601
+
   Scenario: Verify that loanChargePaidByList section has the correct data in loanDetails and in LoanTransactionMakeRepaymentPostBusinessEvent
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -518,7 +518,7 @@
       | 10.0   | Snooze fee |
       | 20.0   | NSF fee    |
 
-  @TestRailId:C2606
+
   Scenario: Verify that after COB job Accrual entry is made when loan has a fee-charge on disbursal date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -532,7 +532,7 @@
       | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
       | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2607
+
   Scenario: Verify that after COB job Accrual entry is made when loan has a penalty-charge on disbursal date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -546,7 +546,7 @@
       | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
       | Accrual          | 10.0   | 0.0       | 0.0      | 0.0  | 10.0      | 0.0          |
 
-  @TestRailId:C2635
+
   Scenario: Verify that charge can be added to loan which is paid off and overpaid by refund
     When Admin sets the business date to "10 January 2023"
     When Admin creates a client with random data
@@ -564,7 +564,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 10 January 2023 | Flat             | 10.0 | 10.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2672
+
   Scenario: FEE01 - Verify the loan creation with charge: disbursement percentage fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -589,7 +589,7 @@
       | 1000          | 0        | 15   | 0         | 1015 | 15   | 0          | 0    | 1000        |
 
 
-  @TestRailId:C2673
+
   Scenario: FEE02 - Verify the loan creation with charge: flat fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -611,7 +611,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 15   | 0         | 1015 | 0    | 0          | 0    | 1015        |
 
-  @TestRailId:C2674
+
   Scenario: FEE03 - Verify the loan creation with charge: installment percentage fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -637,7 +637,7 @@
       | Principal due | Interest | Fees  | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 46.35 | 0         | 3136.35 | 0    | 0          | 0    | 3136.35     |
 
-  @TestRailId:C2675
+
   Scenario: FEE04 - Verify the loan creation with charge: overdue fee on principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -669,7 +669,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 0.0  | 45        | 3135.0 | 0    | 0          | 0    | 3135.0      |
 
-  @TestRailId:C2676
+
   Scenario: FEE05 - Verify the loan creation with charge: overdue fee on principal+interest
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -702,7 +702,7 @@
       | 3000          | 90       | 0.0  | 46.35     | 3136.35 | 0    | 0          | 0    | 3136.35     |
 
 # TODO Create loan product suitable for LOAN_TRANCHE_DISBURSEMENT_PERCENTAGE_FEE, replace, fix expected results
-  @Skip @TestRailId:C2677
+  @Skip
   Scenario: FEE06 - Verify the loan creation with charge: tranche disbursement percentage fee, multi disbursement
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -731,7 +731,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 15   | 0         | 1015 | 15   | 0          | 0    | 1000        |
 
-  @TestRailId:C2790
+
   Scenario: Verify that partially waived installment fee applied correctly in reverse-replay logic
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -762,7 +762,7 @@
       | Name                       | isPenalty | Payment due at  | Due as of | Calculation type         | Due   | Paid | Waived | Outstanding |
       | Installment percentage fee | false     | Installment Fee |           | % Loan Amount + Interest | 100.0 | 5.0  | 95.0   | 0.0         |
 
-  @TestRailId:C2909
+
   Scenario: Verify that adding charge on a closed loan after maturity date is creating an N+1 installment - PIN30 product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -791,7 +791,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 01 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2910
+
   Scenario: Verify that adding charge on a closed loan after maturity date is creating an N+1 installment - PIN4 auto payment enabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -832,7 +832,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2911
+
   Scenario: Verify that adding charge on a closed loan after maturity date is creating an N+1 installment - PIN4 auto payment disabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -874,7 +874,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2912 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that adding charge on a closed loan after maturity date is creating an N+1 installment - PIN4 advanced payment allocation product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -915,7 +915,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2914
+
   Scenario: Verify that adding charge on a active loan / partial repayment after maturity date is creating an N+1 installment - PIN30 product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -944,7 +944,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 01 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2915
+
   Scenario: Verify that adding charge on a active loan / partial repayment after maturity date is creating an N+1 installment - PIN4 auto payment enabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -985,7 +985,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2916
+
   Scenario: Verify that adding charge on a active loan / partial repayment after maturity date is creating an N+1 installment - PIN4 auto payment disabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1027,7 +1027,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2917 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that adding charge on an active loan / partial repayment after maturity date is creating an N+1 installment - PIN4 advanced payment allocation product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1068,7 +1068,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2918
+
   Scenario: Verify that adding charge on a active loan / no repayment made, after maturity date is creating an N+1 installment - PIN30 product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1094,7 +1094,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 01 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2919
+
   Scenario: Verify that adding charge on a active loan / no repayment made, after maturity date is creating an N+1 installment - PIN4 auto payment enabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1126,7 +1126,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2920
+
   Scenario: Verify that adding charge on a active loan / no repayment made, after maturity date is creating an N+1 installment - PIN4 auto payment disabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1157,7 +1157,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2921 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that adding charge on an active loan / no repayment made, after maturity date is creating an N+1 installment - PIN4 advanced payment allocation product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1189,7 +1189,7 @@
       | Name       | isPenalty | Payment due at     | Due as of        | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 November 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2923 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC1
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1224,7 +1224,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 09 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2924 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC2
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1259,7 +1259,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 10 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2925 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC3
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1294,7 +1294,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 11 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2926 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC4
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1329,7 +1329,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2927 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC5
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1364,7 +1364,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 17 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2928 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC6
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1396,7 +1396,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 10 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2929 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC7
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1428,7 +1428,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 October 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2930 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC8
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1460,7 +1460,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 17 October 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2931 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC9
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1491,7 +1491,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 October 2023 | Flat             | 20.0 | 0.0  | 0.0    | 20.0        |
 
-  @TestRailId:C2932 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC10
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1522,7 +1522,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 16 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2933 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan charge reverse-replaying logic for PIN4 advanced payment allocation product - UC11
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1554,7 +1554,7 @@
       | Name       | isPenalty | Payment due at     | Due as of       | Calculation type | Due  | Paid | Waived | Outstanding |
       | Snooze fee | false     | Specified due date | 15 October 2023 | Flat             | 20.0 | 20.0 | 0.0    | 0.0         |
 
-  @TestRailId:C2993
+
   Scenario: Waive charge on PIN4 cumulative loan product
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1599,7 +1599,7 @@
       | Principal due | Interest | Fees | Penalties | Due | Paid  | In advance | Late | Waived | Outstanding |
       | 750           | 0        | 0    | 10        | 760 | 688.0 | 0          | 500  | 10     | 62.0        |
 
-  @TestRailId:C2994
+
   Scenario: Waive charge on PIN4 progressive loan
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1642,7 +1642,7 @@
       | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Waived | Outstanding |
       | 750           | 0        | 0    | 10        | 760 | 500  | 0          | 500  | 10     | 250         |
 
-  @TestRailId:C2995
+
   Scenario: Verify that when a charge added after maturity had been waived the added N+1 installment will be paid with a paid by date (obligations met date) of the transaction date of the waive charge transaction
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
index eff4c40..559534c 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
@@ -1,7 +1,7 @@
 @ChargeOffFeature
 Feature: Charge-off
 
-  @TestRailId:C2565
+
   Scenario: As a user I want to do a Charge-off for non-fraud loan after disbursement
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -21,7 +21,7 @@
       | ASSET   | 112601       | Loans Receivable     |        | 1000.0 |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 1000.0 |        |
 
-  @TestRailId:C2566
+
   Scenario: As a user I want to do a Charge-off for non-fraud loan after repayment
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -47,7 +47,7 @@
       | ASSET   | 112601       | Loans Receivable     |       | 750.0  |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 750.0 |        |
 
-  @TestRailId:C2567
+
   Scenario: As a user I want to do a Repayment undo after Charge-off for non-fraud
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -77,7 +77,7 @@
       | ASSET   | 112601       | Loans Receivable     |        | 1000.0 |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 1000.0 |        |
 
-  @TestRailId:C2568
+
   Scenario: As a user I want to do Charge-off for fraud loan when FEE is added
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -100,7 +100,7 @@
       | EXPENSE | 744007       | Credit Loss/Bad Debt    | 1000.0 |        |
       | INCOME  | 404008       | Fee Charge Off          | 10.0   |        |
 
-  @TestRailId:C2569
+
   Scenario: As a user I want to do a Merchant Refund after charge-off (fee portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -129,7 +129,7 @@
       | INCOME    | 404008       | Fee Charge Off            |       | 10.0   |
       | LIABILITY | 145023       | Suspense/Clearing account | 100.0 |        |
 
-  @TestRailId:C2570
+
   Scenario: As a user I want to do a Charge-off for non-fraud loan when FEE and PENALTY added
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -153,7 +153,7 @@
       | EXPENSE | 744007       | Credit Loss/Bad Debt    | 1000.0 |        |
       | INCOME  | 404008       | Fee Charge Off          | 110.0  |        |
 
-  @Skip @TestRailId:C2571 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do Charge-off for non-fraud loan when FEE and PENALTY added (interest portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -180,7 +180,7 @@
       | INCOME  | 404001       | Interest Income Charge Off | 30.0   |        |
       | INCOME  | 404008       | Fee Charge Off             | 113.0  |        |
 
-  @Skip @TestRailId:C2572 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do a Merchant Refund after charge-off for non fraud loan (interest portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -215,7 +215,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account  | 500.0 |        |
 
 
-  @Skip @TestRailId:C2573 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do a Payout refund after charge-off for non fraud loan (interest portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -249,7 +249,7 @@
       | INCOME    | 404008       | Fee Charge Off             |       | 113.0  |
       | LIABILITY | 145023       | Suspense/Clearing account  | 500.0 |        |
 
-  @Skip @TestRailId:C2574 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario:  As a user I want to do a Repayment after Charge-off for fraud loan when FEE and PENALTY added (product with interest)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -282,7 +282,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account | 500.0 |        |
 
 
-  @TestRailId:C2575
+
   Scenario: As a user I want to do a Charge-off for fraud loan after disbursement
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -303,7 +303,7 @@
       | ASSET   | 112601       | Loans Receivable           |        | 1000.0 |
       | EXPENSE | 744037       | Credit Loss/Bad Debt-Fraud | 1000.0 |        |
 
-  @TestRailId:C2576
+
   Scenario: As a user I want to do a Repayment undo after Charge-off for fraud loan
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -334,7 +334,7 @@
       | ASSET   | 112601       | Loans Receivable           |        | 1000.0 |
       | EXPENSE | 744037       | Credit Loss/Bad Debt-Fraud | 1000.0 |        |
 
-  @TestRailId:C2577
+
   Scenario: As a user I want to do a Charge-off for fraud loan when FEE is added
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -358,7 +358,7 @@
       | EXPENSE | 744037       | Credit Loss/Bad Debt-Fraud | 1000.0 |        |
       | INCOME  | 404008       | Fee Charge Off             | 10.0   |        |
 
-  @TestRailId:C2578
+
   Scenario: As a user I want to do a Charge-off for fraud loan when FEE and PENALTY added
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -383,7 +383,7 @@
       | EXPENSE | 744037       | Credit Loss/Bad Debt-Fraud | 1000.0 |        |
       | INCOME  | 404008       | Fee Charge Off             | 110.0  |        |
 
-  @Skip @TestRailId:C2579 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do a Charge-off for fraud loan when FEE and PENALTY added (interest portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -411,7 +411,7 @@
       | INCOME  | 404001       | Interest Income Charge Off | 30.0   |        |
       | INCOME  | 404008       | Fee Charge Off             | 113.0  |        |
 
-  @Skip @TestRailId:C2580 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do a Merchant issue refund for fraud loan when FEE and PENALTY added (interest portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -446,7 +446,7 @@
       | INCOME    | 404008       | Fee Charge Off             |       | 113.0  |
       | LIABILITY | 145023       | Suspense/Clearing account  | 500.0 |        |
 
-  @Skip @TestRailId:C2581 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do Payout refund for fraud loan when FEE and PENALTY added (interest portion)
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -482,7 +482,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account  | 500.0 |        |
 
 
-  @Skip @TestRailId:C2582 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do a Repayment after Charge-off for fraud loan when FEE and PENALTY added
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -516,7 +516,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account | 500.0 |        |
 
 
-  @Skip @TestRailId:C2591 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to repay a loan which was charged-off
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -575,7 +575,7 @@
       | INCOME    | 744008       | Recoveries                |       | 643.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 643.0 |        |
 
-  @Skip @TestRailId:C2592 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: As a user I want to do a charge-off undo before any other transactions on the loan
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -635,7 +635,7 @@
       | ASSET     | 112603       | Interest/Fee Receivable   |       | 20.0   |
       | LIABILITY | 145023       | Suspense/Clearing account | 200.0 |        |
 
-  @TestRailId:C2593
+
   Scenario: As a user I want to do a Charge-off before the last repayment
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -662,7 +662,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 200.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 200.0 |        |
 
-  @TestRailId:C2594
+
   Scenario: As a user I want to do a Charge-off between 2 repayments
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -691,7 +691,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 200.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 200.0 |        |
 
-  @TestRailId:C2595
+
   Scenario: As a user I want to do a backdated Charge-off when only disbursement transaction happened
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -716,7 +716,7 @@
       | ASSET   | 112601       | Loans Receivable     |        | 1000.0 |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 1000.0 |        |
 
-  @TestRailId:C2596
+
   Scenario: As a user I want to do an undo on a transaction which was created before the Charge-off
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -737,7 +737,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 0    | 0          | 0    | 1000        |
 
-  @TestRailId:C2597
+
   Scenario: As a user I want to do an undo on a transaction which was created on the Charge-off day
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -757,7 +757,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 0    | 0          | 0    | 1000        |
 
-  @TestRailId:C2598
+
   Scenario: As a user I want to do a second Charge-off
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -783,7 +783,7 @@
       | ASSET   | 112601       | Loans Receivable     |        | 1000.0 |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 1000.0 |        |
 
-  @TestRailId:C2599
+
   Scenario: As a user I want to do a second Charge-off undo
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -806,7 +806,7 @@
       | ASSET     | 112601       | Loans Receivable          | 1000.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |        | 1000.0 |
 
-  @TestRailId:C2600
+
   Scenario: As a user I want to add charge after Charge-off
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -835,7 +835,7 @@
     # TODO: Add reschedule related tests for "Reschedule" and "Close as Reschedule" actions if the reschedule API fixed
 
 
-  @TestRailId:C2706
+
   Scenario: Verify that Charge-off NOT results an error anymore when to be applied on a loan with an interest
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -862,7 +862,7 @@
       | 01 January 2023  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0   | 0.0       | 1000.0       |
       | 22 February 2023 | Charge-off       | 1143.0 | 1000.0    | 30.0     | 103.0 | 10.0      | 0.0          |
 
-  @TestRailId:C2761
+
   Scenario: Verify that charge-off is reversed/replayed if Scheduled repayment which was placed on a date before the charge-off is reversed after the charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -903,7 +903,7 @@
       | 01 June 2023     | Charge-off       | 1020.0 | 1000.0    | 0.0      | 20.0 | 0.0       | 0.0          |
     Then On Loan Transactions tab the "Repayment" Transaction with date "01 March 2023" is reverted
 
-  @TestRailId:C2762
+
   Scenario: Verify that charge-off is reversed/replayed if Real time repayment which was placed on a date before the charge-off is reversed after the charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -950,7 +950,7 @@
       | 01 June 2023     | Charge-off       | 1035.0 | 1000.0    | 0.0      | 20.0 | 15.0      | 0.0          |
     Then On Loan Transactions tab the "Repayment" Transaction with date "10 February 2023" is reverted
 
-  @TestRailId:C2763
+
   Scenario: Verify that charge-off is reversed/replayed if Autopay repayment which was placed on a date before the charge-off is reversed after the charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -997,7 +997,7 @@
       | 01 June 2023     | Charge-off       | 1035.0 | 1000.0    | 0.0      | 20.0 | 15.0      | 0.0          |
     Then On Loan Transactions tab the "Repayment" Transaction with date "10 February 2023" is reverted
 
-  @TestRailId:C2764
+
   Scenario: Verify that charge-off is NOT reversed/replayed if OCA repayment which was placed and reversed on a date after the charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1036,7 +1036,7 @@
       | 10 June 2023     | Repayment        | 1000.0 | 980.0     | 0.0      | 20.0 | 0.0       | 20.0         |
     Then On Loan Transactions tab the "Repayment" Transaction with date "10 June 2023" is reverted
 
-  @TestRailId:C2765
+
   Scenario: Verify that charge-off is reversed/replayed if Goodwill credit transaction is placed on a date before the charge-off on business date after the charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1062,7 +1062,7 @@
       | 29 January 2023  | Goodwill Credit  | 500.0  | 480.0     | 0.0      | 20.0 | 0.0       | 520.0        |
       | 01 June 2023     | Charge-off       | 520.0  | 520.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2766
+
   Scenario: As a user I want to do a undo Charge-off with reversal external Id
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1085,7 +1085,7 @@
     And Admin does a charge-off undo the loan with reversal external Id
     Then Loan Charge-off undo event has reversed on date "23 February 2023" for charge-off undo
 
-  @TestRailId:C2767
+
   Scenario: Verify that charge-off is reversed/replayed in case of partial payment, charge-off, second part of payment, reverse 1st payment
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1146,7 +1146,7 @@
       | INCOME    | 744008       | Recoveries                |       | 500.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 500.0 |        |
 
-  @TestRailId:C2768
+
   Scenario: Verify that charge-off is results an error in case of partial payment, charge-off, fee added after charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1174,7 +1174,7 @@
       | Charge type     | dueDate      | amount |
       | LOAN_SNOOZE_FEE | 10 June 2023 | 20     |
 
-  @TestRailId:C2779
+
   Scenario: Verify that on interest bearing loans the accrual of interest is stopped when the loan is charged-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1219,7 +1219,7 @@
       | 03 January 2023  | Accrual          | 0.33    | 0.0       | 0.33     | 0.0  | 0.0       | 0.0          |
       | 05 January 2023  | Charge-off       | 1010.19 | 1000.0    | 10.19    | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2780
+
   Scenario: Verify that on interest bearing loans the accrual of interest is resumed and aggregated when the charge-off is reverted
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1270,7 +1270,7 @@
       | 06 January 2023  | Accrual          | 1.31    | 0.0       | 1.31     | 0.0  | 0.0       | 0.0          |
     Then On Loan Transactions tab the "Charge-off" Transaction with date "04 January 2023" is reverted
 
-  @TestRailId:C2781
+
   Scenario: Verify that on interest bearing loans the accrual of interest is stopped when the loan is charged-off even if fully paid after the charge-off
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1318,7 +1318,7 @@
       | 04 January 2023  | Charge-off       | 1010.19 | 1000.0    | 10.19    | 0.0  | 0.0       | 0.0          |
       | 06 January 2023  | Repayment        | 1010.19 | 1000.0    | 10.19    | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2782
+
   Scenario: Verify that the accrual of charges is not happened when the loan is charged-off on charge's due date but resumed when the charge-off is reverted
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1380,7 +1380,7 @@
       | 06 January 2023  | Accrual          | 15.0   | 0.0       | 0.0      | 15.0 | 0.0       | 0.0          |
     Then On Loan Transactions tab the "Charge-off" Transaction with date "04 January 2023" is reverted
 
-  @TestRailId:C2891 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that the user is able to do a Charge-off for fraud loan when FEE and PENALTY added - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION product
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1407,7 +1407,7 @@
       | EXPENSE | 744037       | Credit Loss/Bad Debt-Fraud | 750.0 |        |
       | INCOME  | 404008       | Fee Charge Off             | 110.0 |        |
 
-  @TestRailId:C2892 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that the user is able to do a Charge-off for non-fraud loan after disbursement - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION product
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1429,7 +1429,7 @@
       | ASSET   | 112601       | Loans Receivable     |       | 750.0  |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 750.0 |        |
 
-  @TestRailId:C2893 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that the user is able to do a Charge-off for non-fraud loan after repayment - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION product
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1457,7 +1457,7 @@
       | ASSET   | 112601       | Loans Receivable     |       | 500.0  |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 500.0 |        |
 
-  @TestRailId:C2894 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that the user is able to do a Repayment undo after Charge-off for non-fraud - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION product
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1489,7 +1489,7 @@
       | ASSET   | 112601       | Loans Receivable     |       | 750.0  |
       | EXPENSE | 744007       | Credit Loss/Bad Debt | 750.0 |        |
 
-  @TestRailId:C2895 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that the user is able to do a backdated Charge-off when only disbursement transaction happened - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION product
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1516,7 +1516,7 @@
       | 01 January 2023  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
       | 10 February 2023 | Charge-off       | 750.0  | 750.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2896 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that charge-off is reversed/replayed if Goodwill credit transaction is placed on a date before the charge-off on business date after the charge-off - - PIN4_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION product
     When Admin sets the business date to "01 January 2023"
     And Admin creates a client with random data
@@ -1548,7 +1548,7 @@
       | 29 January 2023  | Goodwill Credit  | 500.0  | 500.0     | 0.0      | 0.0  | 0.0       | 250.0        |
       | 01 June 2023     | Charge-off       | 270.0  | 250.0     | 0.0      | 20.0 | 0.0       | 0.0          |
 
-  @TestRailId:C3067 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify charge-off GL entries in case of reverse-replay on fraud loan
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeback.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeback.feature
index 140dc06..cd91077 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeback.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeback.feature
@@ -1,7 +1,7 @@
 @LoanChargeback
 Feature: LoanChargeback
 
-  @TestRailId:C2441
+
   Scenario: As an admin I would like to check chargeback function is working properly on a closed loan in case of payment type: REPAYMENT_ADJUSTMENT_CHARGEBACK
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -17,7 +17,7 @@
     Then Loan has 250 outstanding amount
     Then Loan status will be "ACTIVE"
 
-  @TestRailId:C2442
+
   Scenario: As an admin I would like to check chargeback function is working properly on a closed loan in case of payment type: REPAYMENT_ADJUSTMENT_REFUND
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -33,7 +33,7 @@
     Then Loan has 250 outstanding amount
     Then Loan status will be "ACTIVE"
 
-  @TestRailId:C2443
+
   Scenario: As an admin I would like to check chargeback function is working properly when chargeback comes after the loan was fully repaid and closed
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -53,7 +53,7 @@
     Then Loan has 250 outstanding amount
     Then Loan status will be "ACTIVE"
 
-  @TestRailId:C2444
+
   Scenario: As an admin I would like to check chargeback function is working properly when repayment happens again after chargeback
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -74,7 +74,7 @@
     Then Loan has 0 outstanding amount
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
 
-  @TestRailId:C2445
+
   Scenario: As an admin I would like to check chargeback function is working properly when a second chargeback happens after the repayment
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -99,7 +99,7 @@
     Then Loan has 200 outstanding amount
     Then Loan status will be "ACTIVE"
 
-  @TestRailId:C2446
+
   Scenario: As an admin I would like to check chargeback function is working properly when chargeback happens after NSF fee was added to the loan then was repaid
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -129,7 +129,7 @@
     Then Loan has 250 outstanding amount
     Then Loan status will be "ACTIVE"
 
-  @TestRailId:C2447
+
   Scenario: As an admin I would like to check that the loan goes to ACTIVE when the loan is OVERPAID but the chargeback amount is HIGHER than the overpaid amount
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -145,7 +145,7 @@
     Then Loan status will be "ACTIVE"
     Then Loan has 50 outstanding amount
 
-  @TestRailId:C2448
+
   Scenario: As an admin I would like to check that the loan remains OVERPAID when the loan is OVERPAID but the chargeback amount is LOWER than the overpaid amount
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -161,7 +161,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2449
+
   Scenario: As an admin I would like to check that the loan goes to CLOSED when the loan is OVERPAID but the chargeback amount is EQUALS than the overpaid amount
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -177,7 +177,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Loan has 0 outstanding amount
 
-  @TestRailId:C2458
+
   Scenario: As an admin I would like to check that delinquency and overdue treatment of chargeback works properly
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -196,7 +196,7 @@
 #  //Then Loan has 2000 total overdue amount
 #  //TODO overdue amount will not work until New Transactions not updating the overdue calculation and loan status issue is solved
 
-  @TestRailId:C2459
+
   Scenario: As an admin I would like to check that delinquency and overdue treatment of chargeback works properly when all the chargeback transactions are fully paid
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -216,7 +216,7 @@
     Then Admin checks that delinquency range is: "RANGE_1" and has delinquentDate "2022-04-04"
     Then Loan has 1000 total overdue amount
 
-  @TestRailId:C2460
+
   Scenario: As an admin I would like to check that delinquency and overdue treatment of chargeback works properly when all the instalments are fully paid
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -239,7 +239,7 @@
     Then Admin checks that delinquency range is: "NO_DELINQUENCY" and has delinquentDate ""
     Then Loan has 0 total overdue amount
 
-  @TestRailId:C2486
+
   Scenario: As an admin I would like to check that Goodwill credit, Payout refund, Merchant Issued refund works properly with chargeback for a fully paid loan
     When Admin sets the business date to "1 January 2022"
     When Admin creates a client with random data
@@ -269,7 +269,7 @@
     Then Loan has 0 outstanding amount
     Then Loan has 300 overpaid amount
 
-  @TestRailId:C2543
+
   Scenario: When charge backs comes in after the loan is closed, before the maturity date
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -315,7 +315,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
 
-  @TestRailId:C2544
+
   Scenario: When repayment happens again on the charge backs
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -367,7 +367,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 250.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
-  @TestRailId:C2545
+
   Scenario: When repayment 1 is reversed
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -422,7 +422,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 250.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
-  @TestRailId:C2546
+
   Scenario: When 2 repayments are reversed (repayment 1 & 3)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -481,7 +481,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
   #  TODO check the periodic accrual creation + modify
-  @TestRailId:C2547 @Skip
+   @Skip
   Scenario: When chargeback happens after the charge addition on maturity date for repayment 01-03-2022
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -546,7 +546,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
 
-  @TestRailId:C2548
+
   Scenario: When chargeback comes in after the loan overpayment-1
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -594,7 +594,7 @@
       | LIABILITY | l1           | Overpayment account       | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
-  @TestRailId:C2549
+
   Scenario: When chargeback comes in after the loan overpayment-2
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -642,7 +642,7 @@
       | LIABILITY | l1           | Overpayment account       | 150.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 150.0  |
 
-  @TestRailId:C2550
+
   Scenario: When chargeback comes in after the loan overpayment-3
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -691,7 +691,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 350.0  |
       | LIABILITY | l1           | Overpayment account       | 250.0 |        |
 
-  @TestRailId:C2551
+
   Scenario: When chargeback comes in after the loan overpayment-4 with reverse and replay
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -744,7 +744,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 350.0  |
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
 
-  @TestRailId:C2608
+
   Scenario: When charge backs comes in after the loan is closed for the repayment 01-03-2022 (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -791,7 +791,7 @@
       | ASSET     | 112601       | Loans Receivable          | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
-  @TestRailId:C2609
+
   Scenario: When repayment happens again on the charge backs (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -844,7 +844,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 250.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
-  @TestRailId:C2610
+
   Scenario: When repayment 1 is reversed (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -900,7 +900,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 250.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
-  @TestRailId:C2611
+
   Scenario: When 2 repayments are reversed (repayment 1 & 3) (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -959,7 +959,7 @@
       | ASSET     | 112601       | Loans Receivable          |       | 250.0  |
       | LIABILITY | 145023       | Suspense/Clearing account | 250.0 |        |
 
-  @TestRailId:C2623
+
   Scenario: When second charge back happens for the repayment 01-04-2022 (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -1018,7 +1018,7 @@
       | ASSET     | 112601       | Loans Receivable          | 200.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 200.0  |
 
-  @TestRailId:C2612
+
   Scenario: When chargeback happens after the charge addition on maturity date for repayment 01-03-2022 (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -1084,7 +1084,7 @@
       | ASSET     | 112601       | Loans Receivable          | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
-  @TestRailId:C2613
+
   Scenario: When chargeback comes in after the loan overpayment-1 (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -1132,7 +1132,7 @@
       | LIABILITY | l1           | Overpayment account       | 250.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
 
-  @TestRailId:C2614
+
   Scenario: When chargeback comes in after the loan overpayment-2 (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -1180,7 +1180,7 @@
       | LIABILITY | l1           | Overpayment account       | 150.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 150.0  |
 
-  @TestRailId:C2615
+
   Scenario: When chargeback comes in after the loan overpayment-3 (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -1230,7 +1230,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 350.0  |
       | LIABILITY | l1           | Overpayment account       | 250.0 |        |
 
-  @TestRailId:C2616
+
   Scenario: When chargeback comes in after the loan overpayment-4 with reverse and replay (after maturity)
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -1284,7 +1284,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 350.0  |
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
 
-  @TestRailId:C2624
+
   Scenario: As an admin I would like to verify principal portion for partial chargeback for OVERPAID loan
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1315,7 +1315,7 @@
     Then Loan status will be "ACTIVE"
     Then Loan has 500 outstanding amount
 
-  @TestRailId:C2870 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation on a closed loan in case of payment type: REPAYMENT_ADJUSTMENT_CHARGEBACK
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1357,7 +1357,7 @@
       | 16 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2871 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation on a closed loan in case of payment type: REPAYMENT_ADJUSTMENT_REFUND
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1399,7 +1399,7 @@
       | 16 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2872 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation when full repayment happens after chargeback, on the same business date
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1443,7 +1443,7 @@
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
       | 25 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2873 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation when partial repayment happens after chargeback, on the same business date
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1487,7 +1487,7 @@
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
       | 25 October 2023   | Repayment        | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 50.0         |
 
-  @TestRailId:C2874 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation when full repayment happens after chargeback, on a future business date
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1532,7 +1532,7 @@
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
       | 30 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2875 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation when partial repayment happens after chargeback, on a future business date
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1577,7 +1577,7 @@
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
       | 30 October 2023   | Repayment        | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 50.0         |
 
-  @TestRailId:C2876 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation when a second chargeback happens after the repayment
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1625,7 +1625,7 @@
       | 30 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 01 November 2023  | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2877 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation -loan goes to ACTIVE when the it is OVERPAID but the chargeback amount is HIGHER than the overpaid amount
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1667,7 +1667,7 @@
       | 16 October 2023   | Repayment        | 150.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 25 October 2023   | Chargeback       | 100.0  | 50.0      | 0.0      | 0.0  | 0.0       | 50.0         |
 
-  @TestRailId:C2878 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation -loan remains OVERPAID when the it is OVERPAID but the chargeback amount is LOWER than the overpaid amount
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1708,7 +1708,7 @@
       | 16 October 2023   | Repayment        | 150.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 25 October 2023   | Chargeback       | 25.0   | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2879 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation -loan goes to CLOSED when the loan is OVERPAID but the chargeback amount is EQUALS than the overpaid amount
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1749,7 +1749,7 @@
       | 16 October 2023   | Repayment        | 150.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 25 October 2023   | Chargeback       | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C2880 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - chargeback after the loan is closed, before the maturity date
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1787,7 +1787,7 @@
       | 10 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 10 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2881 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - repayment 1 is reversed
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1837,7 +1837,7 @@
       | 25 October 2023   | Chargeback       | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 200.0        |
       | 30 October 2023   | Repayment        | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C3034 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - overpayment handling
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -1866,7 +1866,7 @@
     When Admin makes "REPAYMENT_ADJUSTMENT_CHARGEBACK" chargeback with 100 EUR transaction amount
     Then Loan has 1000 outstanding amount
 
-  @TestRailId:C3038 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - chargeback on downpayment
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -1893,7 +1893,7 @@
       | 01 January 2024  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
       | 01 January 2024  | Chargeback       | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1000.0       |
 
-  @TestRailId:C3039 @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - partial chargeback on downpayment
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -1938,7 +1938,7 @@
     When Admin sets the business date to "17 January 2024"
     When Admin makes "REPAYMENT_ADJUSTMENT_CHARGEBACK" chargeback with 10 EUR transaction amount
 
-  @TestRailId:C3079 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - full chargeback on overpaid loan
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2017,7 +2017,7 @@
       | LIABILITY | l1           | Overpayment account       | 125.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 125.0  |
 
-  @TestRailId:C3080 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - partial chargeback on overpaid loan
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2097,7 +2097,7 @@
       | LIABILITY | l1           | Overpayment account       | 25.0  |        |
       | LIABILITY | 145023       | Suspense/Clearing account |       | 25.0   |
 
-  @TestRailId:C3081 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC1: partial, prior chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2135,7 +2135,7 @@
       | 31 January 2024  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 125.0        |
       | 15 February 2024 | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3082 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC2: partial, prior chargeback with penalty
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2175,7 +2175,7 @@
       | 15 February 2024 | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 15 February 2024 | Accrual          | 3.0    | 0.0       | 0.0      | 0.0  | 3.0       | 0.0          |
 
-  @TestRailId:C3083 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC3: partial, prior chargeback with penalty (2)
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2215,7 +2215,7 @@
       | 15 February 2024 | Repayment        | 128.0  | 128.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 15 February 2024 | Accrual          | 3.0    | 0.0       | 0.0      | 0.0  | 3.0       | 0.0          |
 
-  @TestRailId:C3084 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC4: partial, prior chargeback with penalty and fee
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2257,7 +2257,7 @@
       | 15 February 2024 | Repayment        | 182.0  | 182.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 15 February 2024 | Accrual          | 7.0    | 0.0       | 0.0      | 4.0  | 3.0       | 0.0          |
 
-  @TestRailId:C3085 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC5: full, prior chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2297,7 +2297,7 @@
       | 31 January 2024  | Repayment        | 375.0  | 375.0     | 0.0      | 0.0  | 0.0       | 125.0        |
       | 15 February 2024 | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3086 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC6: full, after chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2345,7 +2345,7 @@
       | 20 February 2024 | Chargeback       | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 500.0        |
       | 28 February 2024 | Repayment        | 500.0  | 500.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3087 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC7: partial, after chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2387,7 +2387,7 @@
       | 20 February 2024 | Chargeback       | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 125.0        |
       | 28 February 2024 | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3088 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation UC8: multiple, prior chargebacks on same payment
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2428,7 +2428,7 @@
       | 31 January 2024  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 125.0        |
       | 15 February 2024 | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3094 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC1: chargeback on principal
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2470,7 +2470,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
       | ASSET     | 112601       | Loans Receivable          | 250.0 |        |
 
-  @TestRailId:C3095 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC2: chargeback on principal and fees
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2519,7 +2519,7 @@
       | ASSET     | 112601       | Loans Receivable          | 250.0 |        |
       | ASSET     | 112603       | Interest/Fee Receivable   | 30.0  |        |
 
-  @TestRailId:C3096 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC3: chargeback on principal and penalties
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2568,7 +2568,7 @@
       | ASSET     | 112601       | Loans Receivable          | 250.0 |        |
       | ASSET     | 112603       | Interest/Fee Receivable   | 30.0  |        |
 
-  @TestRailId:C3097 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC4: when overpayment amount is smaller than chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2614,7 +2614,7 @@
       | LIABILITY | l1           | Overpayment account       | 150.0 |        |
       | ASSET     | 112601       | Loans Receivable          | 100.0 |        |
 
-  @TestRailId:C3098 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC5: with fees- when overpayment amount is bigger than chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2665,7 +2665,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
 
-  @TestRailId:C3099 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC6: when overpayment amount is bigger than chargeback
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2710,7 +2710,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 100.0  |
       | LIABILITY | l1           | Overpayment account       | 100.0 |        |
 
-  @TestRailId:C3100 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC7: chargeback on charge-off loan account with principal
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2753,7 +2753,7 @@
       | LIABILITY | 145023       | Suspense/Clearing account |       | 250.0  |
       | EXPENSE   | 744007       | Credit Loss/Bad Debt      | 250.0 |        |
 
-  @TestRailId:C3101 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC8: chargeback on charge-off loan account with principal and Fees
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2799,7 +2799,7 @@
       | EXPENSE   | 744007       | Credit Loss/Bad Debt      | 250.0 |        |
       | INCOME    | 404008       | Fee Charge Off            | 30.0  |        |
 
-  @TestRailId:C3102 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC9: chargeback on charge-off loan account with principal and Penalties
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -2845,7 +2845,7 @@
       | EXPENSE   | 744007       | Credit Loss/Bad Debt      | 250.0 |        |
       | INCOME    | 404008       | Fee Charge Off            | 30.0  |        |
 
-  @TestRailId:C3111 @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
+   @creditAllocation @AdvancedPaymentAllocationChargeback @AdvancedPaymentAllocation
   Scenario: Verify chargeback function for advanced payment allocation - credit allocation accounting entries UC10: chargeback on overpaid loan
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanDelinquency.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanDelinquency.feature
index 77893db..66c90b3 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanDelinquency.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanDelinquency.feature
@@ -1,7 +1,7 @@
 @LoanDelinquencyFeature
 Feature: LoanDelinquency
 
-  @TestRailId:C2963
+
   Scenario: Verify Loan delinquency pause API - PAUSE and RESUME by loanId
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -22,7 +22,7 @@
       | PAUSE  | 16 October 2023 | 30 October 2023 |
       | RESUME | 20 October 2023 |                 |
 
-  @TestRailId:C2964
+
   Scenario: Verify Loan delinquency pause API - PAUSE and RESUME by loanExternalId
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -43,7 +43,7 @@
       | PAUSE  | 16 October 2023 | 30 October 2023 |
       | RESUME | 20 October 2023 |                 |
 
-  @TestRailId:C2965
+
   Scenario: Verify Loan delinquency pause API - PAUSE and RESUME actions supported only
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -65,7 +65,7 @@
       | PAUSE  | 16 October 2023 | 30 October 2023 |
       | RESUME | 20 October 2023 |                 |
 
-  @TestRailId:C2966
+
   Scenario: Verify Loan delinquency pause API - PAUSE with start date on actual business date
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -80,7 +80,7 @@
       | action | startDate       | endDate         |
       | PAUSE  | 16 October 2023 | 30 October 2023 |
 
-  @TestRailId:C2967
+
   Scenario: Verify Loan delinquency pause API - PAUSE with start date later than actual business date
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -95,7 +95,7 @@
       | action | startDate       | endDate         |
       | PAUSE  | 25 October 2023 | 30 October 2023 |
 
-  @TestRailId:C2968
+
   Scenario: Verify Loan delinquency pause API - PAUSE with start date before than actual business date is possible
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -110,7 +110,7 @@
       | action | startDate       | endDate         |
       | PAUSE  | 14 October 2023 | 30 October 2023 |
 
-  @TestRailId:C2969
+
   Scenario: Verify Loan delinquency pause API - PAUSE action on non-active loan result an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -135,7 +135,7 @@
     When Admin sets the business date to "16 October 2023"
     Then Initiating a DELINQUENCY PAUSE on a non-active loan results an error - startDate: "16 October 2023", endDate: "30 October 2023"
 
-  @TestRailId:C2970
+
   Scenario: Verify Loan delinquency pause API - RESUME action on non-active loan result an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -158,7 +158,7 @@
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
     Then Initiating a DELINQUENCY RESUME on a non-active loan results an error - startDate: "16 October 2023"
 
-  @TestRailId:C2971
+
   Scenario: Verify Loan delinquency pause API - Overlapping PAUSE periods result an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -175,7 +175,7 @@
     When Admin sets the business date to "20 October 2023"
     Then Overlapping PAUSE periods result an error - startDate: "20 October 2023", endDate: "30 October 2023"
 
-  @TestRailId:C2972
+
   Scenario: Verify Loan delinquency pause API - RESUME without an active PAUSE period results an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -186,7 +186,7 @@
     When Admin successfully disburse the loan on "01 October 2023" with "1000" EUR transaction amount
     Then Initiating a DELINQUENCY RESUME without an active PAUSE period results an error - startDate: "01 October 2023"
 
-  @TestRailId:C2973
+
   Scenario: Verify Loan delinquency pause API - RESUME with start date before than actual business date results an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -203,7 +203,7 @@
     When Admin sets the business date to "20 October 2023"
     Then Initiating a DELINQUENCY RESUME with start date other than actual business date results an error - startDate: "01 October 2023"
 
-  @TestRailId:C2974
+
   Scenario: Verify Loan delinquency pause API - RESUME with start date later than actual business date results an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -220,7 +220,7 @@
     When Admin sets the business date to "20 October 2023"
     Then Initiating a DELINQUENCY RESUME with start date other than actual business date results an error - startDate: "21 October 2023"
 
-  @TestRailId:C2975
+
   Scenario: Verify Loan delinquency pause API - RESUME with end date results an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -237,7 +237,7 @@
     When Admin sets the business date to "20 October 2023"
     Then Initiating a DELINQUENCY RESUME with an endDate results an error - startDate: "20 October 2023", endDate: "30 October 2023"
 
-  @Skip @TestRailId:C2992
+  @Skip
   Scenario: Verify Loan level loan delinquency - loan goes into delinquency pause then will be resumed
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -265,7 +265,7 @@
     When Admin runs inline COB job for Loan
     Then Admin checks that delinquency range is: "RANGE_30" and has delinquentDate "2023-10-04"
 
-  @TestRailId:C2979
+
   Scenario: Verify Installment level loan delinquency - loan goes into delinquency bucket
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -282,7 +282,7 @@
       | 4       | RANGE_60 | 500.00 |
     Then Installment level delinquency event has correct data
 
-  @TestRailId:C2980
+
   Scenario: Verify Installment level loan delinquency - loan goes from one delinquency bucket to an other
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -307,7 +307,7 @@
       | 4       | RANGE_60 | 500.00 |
     Then Installment level delinquency event has correct data
 
-  @TestRailId:C2981
+
   Scenario: Verify Installment level loan delinquency - loan goes out from delinquency by late repayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -328,7 +328,7 @@
     Then Installment level delinquency event has correct data
     Then INSTALLMENT level delinquency is null
 
-  @TestRailId:C2982
+
   Scenario: Verify Installment level loan delinquency - some of the installments go out from delinquency by late repayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -350,7 +350,7 @@
       | rangeId | Range   | Amount |
       | 2       | RANGE_3 | 250.00 |
 
-  @TestRailId:C2983
+
   Scenario: Verify Installment level loan delinquency - loan goes out from delinquency by Goodwill credit transaction
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -371,7 +371,7 @@
     Then Installment level delinquency event has correct data
     Then INSTALLMENT level delinquency is null
 
-  @TestRailId:C2984
+
   Scenario: Verify Installment level loan delinquency - some of the installments go out from delinquency by Goodwill credit transaction
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -393,7 +393,7 @@
       | rangeId | Range   | Amount |
       | 2       | RANGE_3 | 250.00 |
 
-  @TestRailId:C2985
+
   Scenario: Verify Installment level loan delinquency - loan with charges goes into delinquency bucket
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -413,7 +413,7 @@
       | 4       | RANGE_60 | 520.00 |
     Then Installment level delinquency event has correct data
 
-  @TestRailId:C2987
+
   Scenario: Verify Installment level loan delinquency - loan goes into delinquency pause
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -458,7 +458,7 @@
       | 3       | RANGE_30 | 500.00 |
       | 4       | RANGE_60 | 500.00 |
 
-  @TestRailId:C2988
+
   Scenario: Verify Installment level loan delinquency - loan goes into delinquency pause then will be resumed
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -501,7 +501,7 @@
       | 2       | RANGE_3  | 250.00 |
       | 3       | RANGE_30 | 500.00 |
 
-  @TestRailId:C2990
+
   Scenario: Verify that a non-super user with CREATE_DELINQUENCY_ACTION permission can initiate a DELINQUENCY PAUSE
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -519,7 +519,7 @@
       | action | startDate       | endDate         |
       | PAUSE  | 16 October 2023 | 30 October 2023 |
 
-  @TestRailId:C2991
+
   Scenario: Verify that a non-super user with no CREATE_DELINQUENCY_ACTION permission gets an error when initiate a DELINQUENCY PAUSE
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -533,7 +533,7 @@
       | REPAYMENT_LOAN |
     Then Created user with no CREATE_DELINQUENCY_ACTION permission gets an error when initiate a DELINQUENCY PAUSE with startDate: "16 October 2023" and endDate: "30 October 2023"
 
-  @TestRailId:C2999
+
   Scenario: Verify Loan delinquency pause E2E - full PAUSE period
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -604,7 +604,7 @@
       | rangeId | Range   | Amount |
       | 2       | RANGE_3 | 250.00 |
 
-  @TestRailId:C3000
+
   Scenario: Verify Loan delinquency pause E2E - PAUSE period with RESUME
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -653,7 +653,7 @@
       | 2       | RANGE_3 | 250.00 |
     Then Installment level delinquency event has correct data
 
-  @TestRailId:C3001
+
   Scenario: Verify Loan delinquency pause E2E - PAUSE period with RESUME and second PAUSE
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -781,7 +781,7 @@
       | 3       | RANGE_30 | 250.00 |
     Then Installment level delinquency event has correct data
 
-  @TestRailId:C3002
+
   Scenario: Verify Loan delinquency pause E2E - full repayment (late/due date) during PAUSE period
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -836,7 +836,7 @@
       | NO_DELINQUENCY | 0.0              | null           | 0              | 0           |
     Then INSTALLMENT level delinquency is null
 
-  @TestRailId:C3003
+
   Scenario: Verify Loan delinquency pause E2E - partial repayment during PAUSE period
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -894,7 +894,7 @@
       | rangeId | Range   | Amount |
       | 2       | RANGE_3 | 100.00 |
 
-  @TestRailId:C3004
+
   Scenario: Verify Loan delinquency pause E2E - full repayment (only late) during PAUSE period then RESUME
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -986,7 +986,7 @@
       | 2       | RANGE_3 | 250.00 |
     Then Installment level delinquency event has correct data
 
-  @TestRailId:C3013
+
   Scenario: Verify that in case of resume on end/start date of continous pause periods first period ends automatically, second period ended by resume
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1050,7 +1050,7 @@
       | rangeId | Range   | Amount |
       | 2       | RANGE_3 | 500.00 |
 
-  @TestRailId:C3014
+
   Scenario: Verify that creating a loan with Advanced payment allocation with product no Advanced payment allocation set results an error
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1058,7 +1058,7 @@
       | LoanProduct | submitted on date | with Principal | ANNUAL interest rate % | interest type | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            |
       | PIN30       | 01 October 2023   | 1000           | 0                      | FLAT          | SAME_AS_REPAYMENT_PERIOD    | EQUAL_INSTALLMENTS | 45                | DAYS                  | 15             | DAYS                   | 3                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
 
-  @TestRailId:C3015
+
   Scenario: Verify Backdated Pause Delinquency - Event Trigger: LoanDelinquencyRangeChangeBusinessEvent, LoanAccountDelinquencyPauseChangedBusinessEvent check
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1093,7 +1093,7 @@
       | rangeId | Range   | Amount |
       | 2       | RANGE_3 | 500.00 |
 
-  @TestRailId:C3016
+
   Scenario: Verify that for pause period calculations business date is being used instead of COB date
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1148,7 +1148,7 @@
       | action | startDate       | endDate         |
       | PAUSE  | 16 October 2023 | 25 October 2023 |
 
-  @TestRailId:C3018
+
   Scenario: Verify that if Global configuration: next-payment-due-date is set to: earliest-unpaid-date then in Loan details delinquent.nextPaymentDueDate will be the first unpaid installment date
     When Global config "next-payment-due-date" value set to "earliest-unpaid-date"
     When Admin sets the business date to "01 October 2023"
@@ -1164,7 +1164,7 @@
     Then Loan details delinquent.nextPaymentDueDate will be "01 October 2023"
     When Global config "next-payment-due-date" value set to "earliest-unpaid-date"
 
-  @TestRailId:C3019
+
   Scenario: Verify that if Global configuration: next-payment-due-date is set to: next-unpaid-due-date then in Loan details delinquent.nextPaymentDueDate will be the next unpaid installment date regardless of the status of previous installments
     When Global config "next-payment-due-date" value set to "next-unpaid-due-date"
     When Admin sets the business date to "01 October 2023"
@@ -1180,7 +1180,7 @@
     Then Loan details delinquent.nextPaymentDueDate will be "31 October 2023"
     When Global config "next-payment-due-date" value set to "earliest-unpaid-date"
 
-  @TestRailId:C3032
+
   Scenario: Verify that delinquencyRange field in LoanAccountDelinquencyRangeDataV1 is not null in case of delinquent Loan
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -1196,7 +1196,7 @@
       | classification | delinquentAmount | delinquentDate  | delinquentDays | pastDueDays |
       | RANGE_30       | 1000.0           | 04 October 2023 | 58             | 61          |
 
-  @TestRailId:C3035
+
   Scenario: Verify that delinquency is NOT applied after loan submitted and approved
     When Admin sets the business date to "30 October 2023"
     When Admin creates a client with random data
@@ -1211,7 +1211,7 @@
       | classification | delinquentAmount | delinquentDate | delinquentDays | pastDueDays |
       | NO_DELINQUENCY | 0.0              | null           | 0              | 0           |
 
-  @TestRailId:C3047
+
   Scenario: Verify that delinquent.lastRepaymentAmount is calculated correctly in case of auto downpayment
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -1223,7 +1223,7 @@
     When Admin sets the business date to "01 April 2024"
     Then In Loan details delinquent.lastRepaymentAmount is 250 EUR with lastRepaymentDate "01 February 2024"
 
-  @TestRailId:C3066 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that on Loans in SUBMITTED_AND_PENDING_APPROVAL or APPROVED status delinquency is not applied
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -1238,7 +1238,7 @@
     Then Admin checks that delinquency range is: "NO_DELINQUENCY" and has delinquentDate ""
 
 #    TODO remove skip when LoanDelinquencyRangeChangeBusinessEvent has wrong values compared to LoanDetails is done and scenario below here does not fail
-  @Skip @TestRailId:C3093
+  @Skip
   Scenario: Verify that LoanDelinquencyRangeChangeBusinessEvent has the correct Delinquency range, date and amount on both loan- and installment-level
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanDownPayment.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanDownPayment.feature
index e519850..8f71828 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanDownPayment.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanDownPayment.feature
@@ -1,7 +1,7 @@
 @LoanDownPaymentFeature
 Feature: Loan DownPayment
 
-  @TestRailId:C2812
+
   Scenario: Single disbursement normal flow - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -51,7 +51,7 @@
       | 01 February 2022 | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 500.0        |
       | 15 February 2022 | Repayment        | 400.0  | 400.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2813
+
   Scenario: Single disbursement normal flow - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -112,7 +112,7 @@
       | 01 February 2022 | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 500.0        |
       | 15 February 2022 | Repayment        | 400.0  | 400.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2814
+
   Scenario: Single disbursement charge flow - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -163,7 +163,7 @@
       | 01 February 2022 | Repayment        | 300.0  | 250.0     | 0.0      | 0.0  | 50.0      | 500.0        |
       | 15 February 2022 | Repayment        | 400.0  | 400.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2815
+
   Scenario: Single disbursement charge flow - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -225,7 +225,7 @@
       | 01 February 2022 | Repayment        | 300.0  | 250.0     | 0.0      | 0.0  | 50.0      | 500.0        |
       | 15 February 2022 | Repayment        | 400.0  | 400.0     | 0.0      | 0.0  | 0.0       | 100.0        |
 
-  @TestRailId:C2816
+
   Scenario: Double disbursement different day - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -266,7 +266,7 @@
       | 10 January 2022  | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
       | 10 January 2022  | Down Payment     | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 1050.0       |
 
-  @TestRailId:C2817
+
   Scenario: Double disbursement different day - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -318,7 +318,7 @@
       | 10 January 2022  | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
 
 
-  @TestRailId:C2818
+
   Scenario: Double disbursement on installment day - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -360,7 +360,7 @@
       | 01 February 2022 | Down Payment     | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 1050.0       |
 
 
-  @TestRailId:C2819
+
   Scenario: Double disbursement on installment day - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -411,7 +411,7 @@
       | 01 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
       | 01 February 2022 | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
 
-  @TestRailId:C2820
+
   Scenario: Downpayment with loan adjustment - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -456,7 +456,7 @@
       | 01 April 2022    | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
       | 01 April 2022    | Down Payment     | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 1050.0       |
 
-  @TestRailId:C2821
+
   Scenario: Downpayment with loan adjustment - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -521,7 +521,7 @@
       | 01 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
       | 01 April 2022    | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
 
-  @TestRailId:C2822
+
   Scenario: Downpayment creation date - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -576,7 +576,7 @@
       | 01 April 2022    | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
       | 01 April 2022    | Down Payment     | 100.0  | 100.0     | 0.0      | 0.0  | 0.0       | 1050.0       |
 
-  @TestRailId:C2823
+
   Scenario: Downpayment creation date - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -641,7 +641,7 @@
       | 10 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
       | 01 April 2022    | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
 
-  @TestRailId:C2824
+
   Scenario: Double disbursement normal flow - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -696,7 +696,7 @@
       | 15 January 2022  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
       | 01 February 2022 | Repayment        | 500.0  | 500.0     | 0.0      | 0.0  | 0.0       | 1000.0       |
 
-  @TestRailId:C2825
+
   Scenario: Double disbursement normal flow - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -761,7 +761,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 01 February 2022 | Repayment        | 500.0  | 500.0     | 0.0      | 0.0  | 0.0       | 1250.0       |
 
-  @TestRailId:C2826
+
   Scenario: Double disbursement same day - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -801,7 +801,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 15 January 2022  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2827
+
   Scenario: Double disbursement same day - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -865,7 +865,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 15 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2828
+
   Scenario: Double disbursement partial overpayment - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -905,7 +905,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 15 January 2022  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2829
+
   Scenario: Double disbursement partial overpayment - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -969,7 +969,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1600.0       |
       | 15 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1350.0       |
 
-  @TestRailId:C2830
+
   Scenario: Double disbursement full overpayment - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1021,7 +1021,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1500.0       |
       | 15 January 2022  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1250.0       |
 
-  @TestRailId:C2831
+
   Scenario: Double disbursement full overpayment - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1085,7 +1085,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1500.0       |
       | 15 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1250.0       |
 
-  @TestRailId:C2832
+
   Scenario: Double disbursement after installment overdue - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1125,7 +1125,7 @@
       | 15 February 2022 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 15 February 2022 | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2833
+
   Scenario: Double disbursement after installment overdue - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1189,7 +1189,7 @@
       | 15 February 2022 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 15 February 2022 | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2834
+
   Scenario: Double disbursement after installment 2 - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1242,7 +1242,7 @@
       | 15 February 2022 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1500.0       |
       | 15 February 2022 | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1250.0       |
 
-  @TestRailId:C2835
+
   Scenario: Double disbursement after installment 2 - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1319,7 +1319,7 @@
       | 15 February 2022 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1500.0       |
       | 15 February 2022 | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1250.0       |
 
-  @TestRailId:C2836
+
   Scenario: Double disbursement normal overdue - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1373,7 +1373,7 @@
       | 15 January 2022  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
       | 15 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1250.0       |
 
-  @TestRailId:C2837
+
   Scenario: Double disbursement normal overdue - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1425,7 +1425,7 @@
       | 15 January 2022  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 2000.0       |
       | 15 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1750.0       |
 
-  @TestRailId:C2838
+
   Scenario: Double disbursement on Duedate - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1465,7 +1465,7 @@
       | 01 February 2022 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 01 February 2022 | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2839
+
   Scenario: Double disbursement on Duedate - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1530,7 +1530,7 @@
       | 01 February 2022 | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
   #  To recheck after verifying that loan product details are correct
-  @Skip @TestRailId:C2852
+  @Skip
   Scenario: Single disbursement with interest - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1551,7 +1551,7 @@
       | 1000.0        | 30       | 0    | 0         | 1030.0 | 0.0  | 0          | 0    | 1030        |
 
   #  To recheck after verifying that loan product details are correct
-  @Skip @TestRailId:C2853
+  @Skip
   Scenario: Single disbursement delinquency - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1574,7 +1574,7 @@
     When Admin runs COB job
     Then Admin checks that delinquency range is: "RANGE_1" and has delinquentDate "2022-01-04"
 
-  @TestRailId:C2854
+
   Scenario: Single disbursement with undo disbursement when auto downpayment is enabled without manual transaction after last downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1600,7 +1600,7 @@
     When Admin successfully undo disbursal
     Then Loan status has changed to "Approved"
 
-  @TestRailId:C2855
+
   Scenario: Single disbursement with undo disbursement when auto downpayment is disabled without manual transaction after last downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1637,7 +1637,7 @@
     When Admin successfully undo disbursal
     Then Loan status has changed to "Approved"
 
-  @TestRailId:C2856
+
   Scenario: Single disbursement with undo disbursement when auto downpayment is disabled with manual transaction after last downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1700,7 +1700,7 @@
     When Admin successfully undo disbursal
     Then Loan status has changed to "Approved"
 
-  @TestRailId:C2857
+
   Scenario: Single disbursement with undo disbursement when auto downpayment is enabled with manual transaction after last downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1753,7 +1753,7 @@
     Then Loan status has changed to "Approved"
 
 
-  @TestRailId:C2858
+
   Scenario: Multi disbursement with undo last disbursement when auto downpayment is enabled without manual transaction after last downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1803,7 +1803,7 @@
       | 01 January 2022  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
 
 
-  @TestRailId:C2859
+
   Scenario: Multi disbursement with undo last disbursement when auto downpayment is disabled without manual transaction after last downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -1865,7 +1865,7 @@
       | 01 January 2022  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
 
 
-  @TestRailId:C2866
+
   Scenario: Verify backdated disbursement - after down payment, before first installment due date, installment start date calculated by loan disbursement date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1910,7 +1910,7 @@
       | 05 January 2023  | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 2000.0       |
       | 05 January 2023  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1750.0       |
 
-  @TestRailId:C2867
+
   Scenario: Verify backdated disbursement - second disbursement placed on after down payment, after first installment paid on due date, and takes place before first installment due date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1973,7 +1973,7 @@
       | 01 February 2023 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1750.0       |
       | 05 February 2023 | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1500.0       |
 
-  @TestRailId:C2868
+
   Scenario: Verify backdated disbursement - after down payment, before first installment due date, installment start date calculated by loan submitted on date
     When Admin sets repaymentStartDateType for "PIN4_DOWNPAYMENT" loan product to "SUBMITTED_ON_DATE"
     When Admin sets the business date to "01 January 2023"
@@ -2020,7 +2020,7 @@
       | 05 January 2023  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1750.0       |
     When Admin sets repaymentStartDateType for "PIN4_DOWNPAYMENT" loan product to "DISBURSEMENT_DATE"
 
-  @TestRailId:C2869
+
   Scenario: Verify correct Loan Repayment EMI Amount is calculated and is rounded off if loan product installmentAmountInMultiplesOf is set
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -2040,7 +2040,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 1250.0        | 0        | 0    | 0         | 1250.0 | 0.0  | 0          | 0    | 1250        |
 
-  @TestRailId:C2882
+
   Scenario: Verify Loan Repayment Due and Overdue events for downpayment
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -2055,7 +2055,7 @@
     When Admin runs inline COB job for Loan
     Then Loan Repayment Overdue Business Event is created
 
-  @TestRailId:C2883
+
   Scenario: Verify that with multiple disbursement when last disbursement is reverted, downpayment will be reverted too - autopayment disabled
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -2101,7 +2101,7 @@
       | 01 September 2023 | Disbursement     | 1000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 1000.0       |
       | 05 September 2023 | Repayment        | 500.0  | 500.0     | 0.0      | 0.0  | 0.0       | 500.0        |
 
-  @TestRailId:C2884
+
   Scenario: Verify that with multiple disbursement when last disbursement is reverted, downpayment will be reverted too - autopayment enabled
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -2150,7 +2150,7 @@
       | 01 September 2023 | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        |
       | 05 September 2023 | Repayment        | 500.0  | 500.0     | 0.0      | 0.0  | 0.0       | 250.0        |
 
-  @TestRailId:C2913
+
   @AdvancedPaymentAllocation
   Scenario: Verify that down-payment Installments are available in the repayment schedule for CREATED, APPROVED and DISBURSED states of the loan account
     When Admin sets the business date to "01 September 2023"
@@ -2208,7 +2208,7 @@
       | Principal due | Interest | Fees | Penalties | Due   | Paid  | In advance | Late | Outstanding |
       | 600.0         | 0        | 0.0  | 0         | 600.0 | 150.0 | 0.0        | 0.0  | 450.0       |
 
-  @TestRailId:C2938
+
   Scenario: Multiple disbursements on same day - auto enabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -2273,7 +2273,7 @@
       | 01 February 2022 | Down Payment     | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 1050.0       |
 
 
-  @TestRailId:C2939
+
   Scenario: Multiple disbursements on same day - auto disabled
     When Admin sets the business date to "01 January 2022"
     When Admin creates a client with random data
@@ -2345,7 +2345,7 @@
       | 01 February 2022 | Disbursement     | 200.0  | 0.0       | 0.0      | 0.0  | 0.0       | 950.0        |
       | 01 February 2022 | Disbursement     | 200.0  | 0.0       | 0.0      | 0.0  | 0.0       | 1150.0       |
 
-  @TestRailId:C3017
+
   Scenario: Verify that repayment schedule is managed properly in case of PIN4 product with two disbursement on the same day
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2374,7 +2374,7 @@
       | 01 October 2023  | Disbursement     | 900.0  | 0.0       | 0.0      | 0.0  | 0.0       | 975.0        |
       | 01 October 2023  | Down Payment     | 225.0  | 225.0     | 0.0      | 0.0  | 0.0       | 750.0        |
 
-  @TestRailId:C3031
+
   Scenario: Verify that in case of auto downpayment Loan details / summary.totalRepaymentTransaction has the downpayment amount
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2385,7 +2385,7 @@
     When Admin successfully disburse the loan on "01 October 2023" with "1000" EUR transaction amount
     Then Loan details has the downpayment amount "250" in summary.totalRepaymentTransaction
 
-  @TestRailId:C3061 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify enhanced auto downpayment for overpaid loans - UC1: overpaid amount > second disbursement amount AND overpaid amount > related downpayment amount
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -2422,7 +2422,7 @@
       | 16 February 2024 | Repayment        | 1000.0 | 375.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 20 February 2024 | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3062 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify enhanced auto downpayment for overpaid loans - UC2: overpaid amount = second disbursement amount AND overpaid amount > related downpayment amount
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -2458,7 +2458,7 @@
       | 16 February 2024 | Repayment        | 1000.0 | 375.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 20 February 2024 | Disbursement     | 625.0  | 0.0       | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3063 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify enhanced auto downpayment for overpaid loans - UC3: overpaid amount < second disbursement amount BUT overpaid amount > related downpayment amount
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -2495,7 +2495,7 @@
       | 16 February 2024 | Repayment        | 575.0  | 375.0     | 0.0      | 0.0  | 0.0       | 0.0          |
       | 20 February 2024 | Disbursement     | 400.0  | 0.0       | 0.0      | 0.0  | 0.0       | 200.0        |
 
-  @TestRailId:C3064 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify enhanced auto downpayment for overpaid loans - UC4: overpaid amount < second disbursement amount AND overpaid amount < related downpayment amount
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
@@ -2533,7 +2533,7 @@
       | 20 February 2024 | Disbursement     | 600.0  | 0.0       | 0.0      | 0.0  | 0.0       | 500.0        |
       | 20 February 2024 | Down Payment     | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 450.0        |
 
-  @TestRailId:C3065 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify enhanced auto downpayment for overpaid loans - UC5: repayment reverted
     When Admin sets the business date to "01 February 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanProduct.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanProduct.feature
index 271f794..49ac3a3 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanProduct.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanProduct.feature
@@ -1,7 +1,7 @@
 @Product
 Feature: LoanProduct
 
-  @Scenario1 @TestRailId:C52
+  @Scenario1
   Scenario: As a user I would like to fully repay the loan in time
     When Admin sets the business date to "12 December 2021"
     When Admin creates a client with random data
@@ -14,7 +14,7 @@
     Then Repayment transaction is created with 1000 amount and "AUTOPAY" type
     Then Loan has 0 outstanding amount
 
-  @Scenario2 @TestRailId:C53
+  @Scenario2
   Scenario: As a user I would like to fully repay a loan which was disbursed 2 times
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -30,7 +30,7 @@
     Then Repayment transaction is created with 1500 amount and "AUTOPAY" type
     Then Loan has 0 outstanding amount
 
-  @Scenario3 @TestRailId:C54
+  @Scenario3
   Scenario: As a user I would like to fully repay a multi disbursed loan with 2 repayments
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -49,7 +49,7 @@
     And Customer makes "AUTOPAY" repayment on "15 July 2022" with 1000 EUR transaction amount
     Then Loan has 0 outstanding amount
 
-  @Scenario4 @TestRailId:C55
+  @Scenario4
   Scenario: As a user I would like to multi disburse a loan which was previously fully paid
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -68,7 +68,7 @@
     And Customer makes "AUTOPAY" repayment on "15 July 2022" with 500 EUR transaction amount
     Then Loan has 0 outstanding amount
 
-  @Scenario5 @TestRailId:C57
+  @Scenario5
   Scenario: As a user I would like to fully repay a loan and check a repayment reversal with NSF fee
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -88,7 +88,7 @@
     And Customer makes "AUTOPAY" repayment on "18 June 2022" with 1010 EUR transaction amount
     Then Loan has 0 outstanding amount
 
-  @Scenario6 @TestRailId:C58
+  @Scenario6
   Scenario: As a user I would like to repay the half amount of the loan and check a repayment reversal with NSF fee
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -108,7 +108,7 @@
     And Customer makes "AUTOPAY" repayment on "18 June 2022" with 1010 EUR transaction amount
     Then Loan has 0 outstanding amount
 
-  @Scenario7 @TestRailId:C59
+  @Scenario7
   Scenario: As a user I would like to fully repay a loan then reverse the repayment + add an NSF fee after the 1 month period
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -128,7 +128,7 @@
     And Customer makes "AUTOPAY" repayment on "5 July 2022" with 1010 EUR transaction amount
     Then Loan has 0 outstanding amount
 
-  @Scenario8 @TestRailId:C60
+  @Scenario8
   Scenario: As a user I would like to repay the half amount of the loan and do a refund
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -144,7 +144,7 @@
     When Refund happens on "1 July 2022" with 500 EUR transaction amount
     Then Loan has 0 outstanding amount
 
-  @Scenario9 @TestRailId:C61
+  @Scenario9
   Scenario: As a user I would like to repay the half amount of the loan and do a refund + repayment reversal on the repayment
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
@@ -162,7 +162,7 @@
     When Customer makes a repayment undo on "25 June 2022"
     Then Loan has 500 outstanding amount
 
-  @Scenario10 @TestRailId:C62
+  @Scenario10
   Scenario: As a user I would like to repay the half amount of the loan and do a refund + repayment reversal + refund reversal
     When Admin sets the business date to "1 June 2022"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanReAging.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanReAging.feature
index 7a7c73a..bfc6ec8 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanReAging.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanReAging.feature
@@ -1,7 +1,7 @@
 @LoanReAgingFeature
 Feature: LoanReAging
 
-  @TestRailId:C3050 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction happy path works properly
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -47,7 +47,7 @@
       | 20 February 2024 | Re-age           | 750.0  | 750.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
     Then Admin checks that delinquency range is: "NO_DELINQUENCY" and has delinquentDate ""
 
-  @TestRailId:C3051 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction made by Loan external ID happy path works properly
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -83,7 +83,7 @@
       | 01 January 2024  | Down Payment     | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        | false    |
       | 20 February 2024 | Re-age           | 750.0  | 750.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
 
-  @TestRailId:C3052 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction undo works properly
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -137,7 +137,7 @@
     Then Admin checks that delinquency range is: "RANGE_30" and has delinquentDate "2024-01-19"
 
 
-  @TestRailId:C3053 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction works properly when chargeback happens after re-aging
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -209,7 +209,7 @@
       | 21 February 2024 | Re-age           | 750.0  | 750.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
       | 25 February 2024 | Chargeback       | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 1000.0       | false    |
 
-  @Skip @TestRailId:C3054 @AdvancedPaymentAllocation
+  @Skip  @AdvancedPaymentAllocation
   Scenario: Verify Loan re-aging transaction - reverse-replay scenario 1
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -250,7 +250,7 @@
 #      | 27 February 2024 | Re-age           | 375.0  | 375.0     | 0.0      | 0.0  | 0.0       | 125.0        | true     |
 #    Then Admin checks that delinquency range is: "RANGE_30" and has delinquentDate "2024-01-19"
 
-  @Skip @TestRailId:C3055 @AdvancedPaymentAllocation
+  @Skip  @AdvancedPaymentAllocation
   Scenario: Verify Loan re-aging transaction - reverse-replay scenario 2
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -268,7 +268,7 @@
     When Admin successfully undo Loan re-aging transaction
     #    TODO fill with proper expected data and checks
 
-  @TestRailId:C3056 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction - chargeback before maturity and  prior to re-aging
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -335,7 +335,7 @@
       | 02 February 2024 | Chargeback       | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 875.0        | false    |
       | 21 February 2024 | Re-age           | 875.0  | 875.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
 
-  @TestRailId:C3057 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction - chargeback after maturity date and prior to re-aging
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -404,7 +404,7 @@
       | 20 February 2024 | Chargeback       | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 875.0        | false    |
       | 21 February 2024 | Re-age           | 875.0  | 875.0     | 0.0      | 0.0  | 0.0       | 0.0          | false    |
 
-  @TestRailId:C3058 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that Loan re-aging transaction - chargeback after maturity date and prior to re-aging with charge N+1 installment
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -479,7 +479,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 1125.0        | 0.0      | 0.0  | 20.0      | 1145.0 | 270.0| 0.0        | 20.0 | 875.0       |
 
-  @TestRailId:C3059 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-aging transaction - partial principal payment scenario + undo re-ageing
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -552,7 +552,7 @@
       | 16 January 2024  | Repayment        | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 325.0        | false    |
       | 27 February 2024 | Re-age           | 325.0  | 325.0     | 0.0      | 0.0  | 0.0       | 0.0          | true     |
 
-  @TestRailId:C3091 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-age transaction - Event check
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanReAmortization.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanReAmortization.feature
index 6b717fb..c37a019 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanReAmortization.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanReAmortization.feature
@@ -1,7 +1,7 @@
 @LoanReAmortizationFeature
 Feature: LoanReAmortization
 
-  @TestRailId:C3069 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - re-amortization happy path
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -43,7 +43,7 @@
       | 01 January 2024  | Down Payment     | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 375.0        |
       | 25 January 2024  | Re-amortize      | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3070 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - re-amortization happy path with loan externalId
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -85,7 +85,7 @@
       | 01 January 2024  | Down Payment     | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 375.0        |
       | 25 January 2024  | Re-amortize      | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3071 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - re-amortization undo happy path
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -131,7 +131,7 @@
       | 25 January 2024  | Re-amortize      | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          | true     |
     Then Admin checks that delinquency range is: "RANGE_3" and has delinquentDate "2024-01-19"
 
-  @TestRailId:C3072 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - delinquency calculation triggered upon re-amortization transaction
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -148,7 +148,7 @@
     When When Admin creates a Loan re-amortization transaction on current business date
     Then Admin checks that delinquency range is: "NO_DELINQUENCY" and has delinquentDate ""
 
-  @TestRailId:C3073 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - UC1: re-amortization after charge applied on loan
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -178,7 +178,7 @@
       | 01 January 2024  | Down Payment     | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 375.0        |
       | 25 January 2024  | Re-amortize      | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3074 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - UC2: complete past due principal amount reamortization scenario
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -206,7 +206,7 @@
       | 01 January 2024  | Down Payment     | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 375.0        |
       | 01 February 2024 | Re-amortize      | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3075 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - UC3: reverse replay scenario
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -252,7 +252,7 @@
       | 15 January 2024  | Repayment        | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 250.0        |
       | 01 February 2024 | Re-amortize      | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3076 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - UC4: N+1 Installment scenario
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -282,7 +282,7 @@
       | 01 January 2024  | Down Payment     | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 375.0        |
       | 01 February 2024 | Re-amortize      | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3077 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - UC5: re-amortization on same day of installment
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -312,7 +312,7 @@
       | 01 January 2024  | Down Payment     | 125.0  | 125.0     | 0.0      | 0.0  | 0.0       | 375.0        |
       | 31 January 2024  | Re-amortize      | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3078 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - UC6: Parital Paid Scenario
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -358,7 +358,7 @@
       | 17 January 2024  | Repayment        | 50.0   | 50.0      | 0.0      | 0.0  | 0.0       | 325.0        |
       | 30 January 2024  | Re-amortize      | 75.0   | 75.0      | 0.0      | 0.0  | 0.0       | 0.0          |
 
-  @TestRailId:C3089 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify Loan re-amortization transaction - Event check
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanRepayment.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanRepayment.feature
index 0a628f1..dae572a 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanRepayment.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanRepayment.feature
@@ -1,7 +1,7 @@
 @Repayment
 Feature: LoanRepayment
 
-  @TestRailId:C49
+
   Scenario Outline: Loan repayment functionality with business date setup
     When Admin sets the business date to <businessDate>
     When Admin creates a client with random data
@@ -14,7 +14,7 @@
       | businessDate  | approveDate   | expectedDisbursementDate | disbursementDate | repaymentDate | transactionAmount |
       | "1 July 2022" | "1 July 2022" | "1 July 2022"            | "1 July 2022"    | "1 July 2022" | 200               |
 
-  @TestRailId:C32
+
   Scenario: As a user I would like to check that the repayment transaction is failed when the repayment date is after the business date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -24,7 +24,7 @@
     And Customer makes "AUTOPAY" repayment on "2 July 2022" with 200 EUR transaction amount (and transaction fails because of wrong date)
     Then Repayment failed because the repayment date is after the business date
 
-  @TestRailId:C44
+
   Scenario: As a user I would like to check that the repayment is successful if the repayment date is equal to the business date
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -34,7 +34,7 @@
     And Customer makes "AUTOPAY" repayment on "1 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "AUTOPAY" type
 
-  @TestRailId:C45
+
   Scenario: As a user I would like to increase the business day by the scheduled job and want to create a repayment transaction on that day
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -45,7 +45,7 @@
     And Customer makes "AUTOPAY" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "AUTOPAY" type
 
-  @TestRailId:C2430
+
   Scenario: Verify that as a user I am able to make a repayment with AutoPay type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -56,7 +56,7 @@
     And Customer makes "AUTOPAY" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "AUTOPAY" type
 
-  @TestRailId:C2431
+
   Scenario: Verify that as a user I am able to make a repayment with Down payment type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -67,7 +67,7 @@
     And Customer makes "DOWN_PAYMENT" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "DOWN_PAYMENT" type
 
-  @TestRailId:C2432
+
   Scenario: Verify that as a user I am able to make a repayment with Real time type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -78,7 +78,7 @@
     And Customer makes "REAL_TIME" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "REAL_TIME" type
 
-  @TestRailId:C2433
+
   Scenario: Verify that as a user I am able to make a repayment with Scheduled type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -89,7 +89,7 @@
     And Customer makes "SCHEDULED" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "SCHEDULED" type
 
-  @TestRailId:C2434
+
   Scenario: Verify that as a user I am able to make a repayment with Check payment type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -100,7 +100,7 @@
     And Customer makes "CHECK_PAYMENT" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "CHECK_PAYMENT" type
 
-  @TestRailId:C2435
+
   Scenario: Verify that as a user I am able to make a repayment with Oca payment type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -111,7 +111,7 @@
     And Customer makes "OCA_PAYMENT" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "OCA_PAYMENT" type
 
-  @TestRailId:C2436
+
   Scenario: Verify that as a user I am able to make a repayment with Adjustment chargeback payment type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -122,7 +122,7 @@
     And Customer makes "REPAYMENT_ADJUSTMENT_CHARGEBACK" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "Repayment Adjustment Chargeback" type
 
-  @TestRailId:C2437
+
   Scenario: Verify that as a user I am able to make a repayment with Adjustment refund payment type
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -133,7 +133,7 @@
     And Customer makes "REPAYMENT_ADJUSTMENT_REFUND" repayment on "2 July 2022" with 200 EUR transaction amount
     Then Repayment transaction is created with 200 amount and "Repayment Adjustment Refund" type
 
-  @TestRailId:C2464
+
   Scenario: As a user I would like to check the Autopay repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -151,7 +151,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2465
+
   Scenario: As a user I would like to check the Down payment repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -169,7 +169,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2466
+
   Scenario: As a user I would like to check the real time repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -187,7 +187,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2467
+
   Scenario: As a user I would like to check the scheduled repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -205,7 +205,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2468
+
   Scenario: As a user I would like to check the check payment repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -223,7 +223,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2469
+
   Scenario: As a user I would like to check the oca payment repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -241,7 +241,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2470
+
   Scenario: As a user I would like to check the repayment adjustment chargeback repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -259,7 +259,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2471
+
   Scenario: As a user I would like to check the repayment adjustment refund repayment undo and repayment after loan closed state
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -277,7 +277,7 @@
     Then Loan status will be "OVERPAID"
     Then Loan has 100 overpaid amount
 
-  @TestRailId:C2485
+
   Scenario: Verify that inlineCOB job creates two separate events for LoanRepaymentDueBusinessEvent and LoanRepaymentOverdueBusinessEvent: due and overdue days values from global config
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -291,7 +291,7 @@
     When Admin runs inline COB job for Loan
     Then Loan Repayment Overdue Business Event is created
 
-  @TestRailId:C2689
+
   Scenario: Verify that inlineCOB job creates two separate events for LoanRepaymentDueBusinessEvent and LoanRepaymentOverdueBusinessEvent: due and overdue days values from Loan product
     When Admin sets the business date to "1 January 2023"
     When Admin creates a client with random data
@@ -307,7 +307,7 @@
     When Admin runs inline COB job for Loan
     Then Loan Repayment Overdue Business Event is created
 
-  @TestRailId:C2490
+
   Scenario: RS01 - Repayment Schedule with interest type: flat, interest period: Same as payment period, amortization type: Equal installments
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -339,7 +339,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 5000          | 900      | 0    | 0         | 5900 | 0    | 0          | 0    | 5900        |
 
-  @TestRailId:C2492
+
   Scenario: RS02 - Repayment Schedule with interest type: Declining Balance, interest period: Same as payment period, amortization type: Equal installments
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -371,7 +371,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 5000          | 488.22   | 0    | 0         | 5488.22 | 0    | 0          | 0    | 5488.22     |
 
-  @TestRailId:C2493
+
   Scenario: RS03 - Repayment Schedule with interest type: Declining Balance, interest period: Daily, amortization type: Equal installments
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -403,7 +403,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 5000          | 487.33   | 0    | 0         | 5487.33 | 0    | 0          | 0    | 5487.33     |
 
-  @TestRailId:C2494
+
   Scenario: RS04 - Repayment Schedule with interest type: Declining Balance, interest period: Same as payment period, amortization type: Equal principal payments
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -435,7 +435,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 5000          | 475.0    | 0    | 0         | 5475.0 | 0    | 0          | 0    | 5475.0      |
 
-  @TestRailId:C2495
+
   Scenario: RS05 - Repayment Schedule with interest type: Declining Balance, interest period: Same as payment period, amortization type: Equal installments, Grace on principal payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -467,7 +467,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 5000          | 558.87   | 0    | 0         | 5558.87 | 0    | 0          | 0    | 5558.87     |
 
-  @TestRailId:C2496
+
   Scenario: RS06 - Repayment Schedule with interest type: Declining Balance, interest period: Same as payment period, amortization type: Equal installments, Grace on principal payment and interest payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -499,7 +499,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 5000          | 631.09   | 0    | 0         | 5631.09 | 0    | 0          | 0    | 5631.09     |
 
-  @TestRailId:C2497
+
   Scenario: RS07 - Repayment Schedule with interest type: Declining Balance, interest period: Same as payment period, amortization type: Equal installments, Grace on principal payment and setting up interest free period
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -531,7 +531,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 5000          | 631.09   | 0    | 0         | 5631.09 | 0    | 0          | 0    | 5631.09     |
 
-  @TestRailId:C2498
+
   Scenario: As admin I would like to be sure that Edit from Goodwill Credit of on loan transaction can not be done
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -543,7 +543,7 @@
     And Customer makes "GOODWILL_CREDIT" transaction with "AUTOPAY" payment type on "15 November 2022" with 200 EUR transaction amount and self-generated Idempotency key
     Then Loan "loanPaymentTransactionResponse" transaction adjust amount 900 must return 403 code
 
-  @TestRailId:C2499
+
   Scenario: As admin I would like to be sure that Edit from Payout Refund of on loan transaction can not be done
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -555,7 +555,7 @@
     And Refund happens on "15 November 2022" with 100 EUR transaction amount
     Then Loan "loanRefundResponse" transaction adjust amount 90 must return 403 code
 
-  @TestRailId:C2500
+
   Scenario: As admin I would like to be sure that Edit from Merchant Issued Refund of on loan transaction can not be done
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -567,7 +567,7 @@
     And Customer makes "MERCHANT_ISSUED_REFUND" transaction with "AUTOPAY" payment type on "15 November 2022" with 200 EUR transaction amount and self-generated Idempotency key
     Then Loan "loanPaymentTransactionResponse" transaction adjust amount 190 must return 403 code
 
-  @TestRailId:C2531
+
   Scenario: As admin I would like to check the last payment amount after a merchant issue refund
     When Admin sets the business date to "9 February 2023"
     And Admin creates a client with random data
@@ -578,7 +578,7 @@
     And Customer makes "AUTOPAY" repayment on "9 February 2023" with 200 EUR transaction amount
     Then Loan has 200 last payment amount
 
-  @TestRailId:C2555
+
   Scenario: RP01 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with Interest compounding
     When Admin sets the business date to "1 September 2022"
     When Admin creates a client with random data
@@ -602,7 +602,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late  | Outstanding |
       | 5000.0        | 178.96   | 0.0  | 0.0       | 5178.96 | 862.0 | 0.0        | 862.0 | 4316.96     |
 
-  @TestRailId:C2556
+
   Scenario: RP02 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with on time exact payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -626,7 +626,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late | Outstanding |
       | 5000.0        | 175.46   | 0.0  | 0.0       | 5175.46 | 863.0 | 0.0        | 0.0  | 4312.46     |
 
-  @TestRailId:C2557
+
   Scenario: RP03 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with early exact payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -650,7 +650,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late | Outstanding |
       | 5000.0        | 172.81   | 0.0  | 0.0       | 5172.81 | 863.0 | 863.0      | 0.0  | 4309.81     |
 
-  @TestRailId:C2558
+
   Scenario: RP04 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with late exact payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -674,7 +674,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late  | Outstanding |
       | 5000.0        | 176.61   | 0.0  | 0.0       | 5176.61 | 862.0 | 0.0        | 862.0 | 4314.61     |
 
-  @TestRailId:C2559
+
   Scenario: RP05 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with on time partial payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -698,7 +698,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 5000.0        | 175.5    | 0.0  | 0.0       | 5175.5 | 200.0 | 0.0        | 0.0  | 4975.50     |
 
-  @TestRailId:C2560
+
   Scenario: RP06 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with early partial payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -722,7 +722,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late | Outstanding |
       | 5000.0        | 175.21   | 0.0  | 0.0       | 5175.21 | 200.0 | 200.0      | 0.0  | 4975.21     |
 
-  @TestRailId:C2561
+
   Scenario: RP07 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with late partial payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -746,7 +746,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late  | Outstanding |
       | 5000.0        | 176.61   | 0.0  | 0.0       | 5176.61 | 200.0 | 0.0        | 200.0 | 4976.61     |
 
-  @TestRailId:C2562
+
   Scenario: RP08 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with on time excess payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -770,7 +770,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In advance | Late | Outstanding |
       | 5000.0        | 156.24   | 0.0  | 0.0       | 5156.24 | 1500.0 | 0.0        | 0.0  | 3656.24     |
 
-  @TestRailId:C2563
+
   Scenario: RP09 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with early excess payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -794,7 +794,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In advance | Late | Outstanding |
       | 5000.0        | 152.77   | 0.0  | 0.0       | 5152.77 | 1500.0 | 1500.0     | 0.0  | 3652.77     |
 
-  @TestRailId:C2564
+
   Scenario: RP10 - Repayment Schedule with interest type: Declining Balance and Interest Recalculation with late excess payment
     When Admin sets the business date to "1 November 2022"
     When Admin creates a client with random data
@@ -818,7 +818,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In advance | Late  | Outstanding |
       | 5000.0        | 170.74   | 0.0  | 0.0       | 5170.74 | 1500.0 | 638.0      | 862.0 | 3670.74     |
 
-  @TestRailId:C2625
+
   Scenario: Verify that the accounting treatment is correct for Goodwill Credit transaction
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -857,7 +857,7 @@
       | INCOME  | 404001       | Interest Income Charge Off | 10.0  |        |
       | INCOME  | 404008       | Fee Charge Off             | 13.0  |        |
 
-  @Skip @TestRailId:C2626 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: Verify that the accounting treatment is correct for Goodwill Credit transaction after Charge-off
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -903,7 +903,7 @@
       | INCOME  | 404001       | Interest Income Charge Off | 10.0  |        |
       | INCOME  | 404008       | Fee Charge Off             | 13.0  |        |
 
-  @TestRailId:C2627
+
   Scenario: Verify that the accounting treatment is correct for Goodwill Credit transaction when undo happened
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -948,7 +948,7 @@
       | INCOME  | 404001       | Interest Income Charge Off |       | 10.0   |
       | INCOME  | 404008       | Fee Charge Off             |       | 13.0   |
 
-  @Skip @TestRailId:C2628 @chargeoffOnLoanWithInterest
+  @Skip  @chargeoffOnLoanWithInterest
   Scenario: Verify that the accounting treatment is correct for Goodwill Credit transaction when the loan was Charged-off and undo happened for Goodwill
     When Admin sets the business date to "1 January 2023"
     And Admin creates a client with random data
@@ -1000,7 +1000,7 @@
       | INCOME  | 404001       | Interest Income Charge Off |       | 10.0   |
       | INCOME  | 404008       | Fee Charge Off             |       | 13.0   |
 
-  @TestRailId:C2629
+
   Scenario: RP11 - Repayment Schedule with interest type: Declining Balance - Prepayment - Reduce number of installments
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1025,7 +1025,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In advance | Late | Outstanding |
       | 5000.0        | 127.48   | 0.0  | 0.0       | 5127.48 | 3000.0 | 0.0        | 0.0  | 2127.48     |
 
-  @TestRailId:C2630
+
   Scenario: RP12 - Repayment Schedule with interest type: Declining Balance - Prepayment - Reduce Installment amount
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1051,7 +1051,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In advance | Late | Outstanding |
       | 5000.0        | 142.38   | 0.0  | 0.0       | 5142.38 | 3000.0 | 0.0        | 0.0  | 2142.38     |
 
-  @TestRailId:C2631
+
   Scenario: RP13 - Repayment Schedule with interest type: Declining Balance - Prepayment - Reschedule next repayments
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1077,7 +1077,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In advance | Late | Outstanding |
       | 5000.0        | 156.56   | 0.0  | 0.0       | 5156.56 | 3000.0 | 0.0        | 0.0  | 2156.56     |
 
-  @TestRailId:C2632
+
   Scenario: RP14 - Repayment Schedule with interest type: Declining Balance - Interest Recalculation Frequency: Same as Repayment Period - Partial payment
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1103,7 +1103,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late  | Outstanding |
       | 5000.0        | 191.04   | 0.0  | 0.0       | 5191.04 | 400.0 | 200.0      | 200.0 | 4791.04     |
 
-  @TestRailId:C2633
+
   Scenario: RP15 - Repayment Schedule with interest type: Declining Balance - Interest Recalculation Frequency: Same as Repayment Period - Late payment
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1127,7 +1127,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid  | In advance | Late  | Outstanding |
       | 5000.0        | 192.63   | 0.0  | 0.0       | 5192.63 | 862.0 | 0.0        | 862.0 | 4330.63     |
 
-  @TestRailId:C2634
+
   Scenario: RP16 - Repayment Schedule with interest type: Declining Balance - Interest Recalculation Frequency: Same as Repayment Period - Multi-disbursement
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -1162,7 +1162,7 @@
       | 10000.0       | 207.39   | 0.0  | 0.0       | 10207.39 | 6900.0 | 0.0        | 0.0  | 3307.39     |
 
 
-  @TestRailId:C2636 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - adding charge due in the future
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1190,7 +1190,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 50        | 1050 | 500  | 500        | 0    | 550         |
 
-  @TestRailId:C2637 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - adding charge due in the future, then repayments before and after charge due date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1224,7 +1224,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 50        | 1050 | 1000 | 1000       | 0    | 50          |
 
-  @TestRailId:C2638 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - adding charge due in the future, then repayment before due date, new charge with due date in future and repayment on first charge due date
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1261,7 +1261,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 60        | 1060 | 700  | 700        | 0    | 360         |
 
-  @Skip @TestRailId:C2639 @PaymentStrategyDueInAdvance
+  @Skip  @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - adding charge due in the future, then repayment before due date with full amount
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1292,7 +1292,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 50        | 1050 | 1050 | 1000       | 0    | 0           |
 
-  @TestRailId:C2655 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1317,7 +1317,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 0         | 3000 | 1000 | 0          | 0    | 2000        |
 
-  @TestRailId:C2656 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - inAdvance principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1342,7 +1342,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 0         | 3000 | 1000 | 1000       | 0    | 2000        |
 
-  @TestRailId:C2657 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due + inAdvance principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1367,7 +1367,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 0         | 3000 | 1500 | 500        | 0    | 1500        |
 
-  @TestRailId:C2658 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + due principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1393,7 +1393,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 50        | 3050 | 500  | 0          | 0    | 2550        |
 
-  @TestRailId:C2659 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due fee + due principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1419,7 +1419,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 50   | 0         | 3050 | 500  | 0          | 0    | 2550        |
 
-  @TestRailId:C2660 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due interest + due principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1444,7 +1444,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 0    | 0         | 3090 | 500  | 0          | 0    | 2590        |
 
-  @TestRailId:C2661 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + due fee + due principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1471,7 +1471,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 50   | 50        | 3100 | 500  | 0          | 0    | 2600        |
 
-  @TestRailId:C2662 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + inAdvance principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1497,7 +1497,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 50        | 3050 | 500  | 500        | 0    | 2550        |
 
-  @TestRailId:C2663 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + inAdvance principal + inAdvance penalty not effective because of partial payment
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1524,7 +1524,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 100       | 3100 | 500  | 500        | 0    | 2600        |
 
-  @TestRailId:C2664 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + inAdvance principal + inAdvance penalty
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1551,7 +1551,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 100       | 3100 | 1100 | 1100       | 0    | 2000        |
 
-  @TestRailId:C2665 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + inAdvance principal + inAdvance penalty + inAdvance fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1579,7 +1579,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 50   | 100       | 3150 | 1150 | 1150       | 0    | 2000        |
 
-  @TestRailId:C2666 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - due penalty + inAdvance principal + inAdvance penalty + inAdvance fee + inAdvance interest
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1608,7 +1608,7 @@
       | 3000          | 90       | 50   | 100       | 3240 | 1180 | 1180       | 0    | 2060        |
 
 
-  @TestRailId:C2667 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - repayment + reversal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1650,7 +1650,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 50   | 100       | 3240 | 0    | 0          | 0    | 3240        |
 
-  @TestRailId:C2668 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - merchant issued refund + reversal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1692,7 +1692,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 50   | 100       | 3240 | 0    | 0          | 0    | 3240        |
 
-  @TestRailId:C2669 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - payout refund + reversal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1734,7 +1734,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 50   | 100       | 3240 | 0    | 0          | 0    | 3240        |
 
-  @TestRailId:C2670 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - goodwill credit transaction + reversal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1776,7 +1776,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 90       | 50   | 100       | 3240 | 0    | 0          | 0    | 3240        |
 
-  @TestRailId:C2671 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - repayment + charge adjustment + charge adjustment reversal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1837,7 +1837,7 @@
       | 3000          | 90       | 50   | 100       | 3240 | 1180 | 1180       | 0    | 2060        |
 
 
-  @TestRailId:C2682 @PaymentStrategyDueInAdvance
+   @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy - fee - repayment - nsffee - chargeback - repayment
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1869,7 +1869,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1500          | 0        | 10   | 25        | 1535 | 1000 | 1000       | 0    | 535         |
 
-  @Skip @TestRailId:C2799 @PaymentStrategyDueInAdvance
+  @Skip  @PaymentStrategyDueInAdvance
   Scenario: Verify the due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy payment strategy: Same day transaction
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1897,7 +1897,7 @@
       | 12 January 2023  | Accrual          | 10.0   | 0.0       | 0.0      | 10.0 | 0.0       | 0.0          |
       | 12 January 2023  | Repayment        | 510.0  | 500.0     | 0.0      | 10.0 | 0.0       | 0.0          |
 
-  @TestRailId:C2694 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC1 - no fees or penalties, due payment
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1920,7 +1920,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 1000 | 0          | 0    | 0           |
 
-  @TestRailId:C2695 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC2 - due principal, fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -1949,7 +1949,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 20   | 0         | 1020 | 1020 | 0          | 0    | 0           |
 
-  @TestRailId:C2696 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC3 - in advance principal, reverted, due penalty, principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2000,7 +2000,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 20        | 1020 | 1020 | 0          | 0    | 0           |
 
-  @TestRailId:C2697 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC4 - in advance principal, fee, reverted, due penalty, principal, fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2069,7 +2069,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 20   | 20        | 1040 | 1040 | 0          | 0    | 0           |
 
-  @TestRailId:C2698 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC5 - in advance principal, fee, reverted, multiple due penalty, principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2184,7 +2184,7 @@
       | 1000          | 0        | 20   | 40        | 1060 | 1060 | 0          | 1040 | 0           |
 
 
-  @TestRailId:C2699 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC6 - partial payment
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2210,7 +2210,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 1000 | 500        | 0    | 0           |
 
-  @TestRailId:C2700 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC7 - partial payment, in advance principal, due principal, fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2253,7 +2253,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 20   | 0         | 1020 | 1020 | 500        | 0    | 0           |
 
-  @TestRailId:C2701 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC8 - partial payment, in advance principal, due penalty, principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2318,7 +2318,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 20        | 1020 | 1020 | 520        | 0    | 0           |
 
-  @TestRailId:C2702 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC9 - partial payment, in advance principal, fee, due penalty, principal
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2432,7 +2432,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 20   | 20        | 1040 | 1040 | 520        | 20   | 0           |
 
-  @TestRailId:C2703 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC10 - partial payment, in advance principal, fee, due penalty
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2523,7 +2523,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 20   | 20        | 1040 | 1040 | 1040       | 0    | 0           |
 
-  @TestRailId:C2704 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC11 - partial payment, in advance principal, fee, due penalty, principal, fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2662,7 +2662,7 @@
       | 1000          | 0        | 20   | 40        | 1060 | 1060 | 0          | 1040 | 0           |
 
 
-  @TestRailId:C2705 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+   @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: UC12 - partial payment, in advance penalty, interest, principal, fee due penalty, interest, principal, fee
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2812,7 +2812,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 10       | 20   | 20        | 1050 | 1050 | 0          | 0    | 0           |
 
-  @Skip @TestRailId:C2800 @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
+  @Skip  @PaymentStrategyDueInAdvancePenaltyInterestPrincipalFee
   Scenario: Verify the due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy payment strategy: Same day transaction
     When Admin sets the business date to "01 January 2023"
     When Admin creates a client with random data
@@ -2840,7 +2840,7 @@
       | 12 January 2023  | Accrual          | 20.1   | 0.0       | 10.0     | 10.1 | 0.0       | 0.0          |
       | 12 January 2023  | Repayment        | 520.1  | 510.0     | 0.0      | 10.1 | 0.0       | 0.0          |
 
-  @TestRailId:C2810
+
   Scenario: As a user I would like to adjust an existing repayment and validate the event
     When Admin sets the business date to "01 November 2022"
     When Admin creates a client with random data
@@ -2861,7 +2861,7 @@
       | Repayment        | 9.0    | 9.0       | 0.0      | 0.0  | 0.0       | 991.0        |
       | Repayment        | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 990.0        |
 
-  @TestRailId:C2898
+
   Scenario: Verify that in case of non/disbursed loan LoanRepaymentDueBusinessEvent is not sent - PIN30 product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2878,7 +2878,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2899
+
   Scenario: Verify that in case of non/disbursed loan LoanRepaymentDueBusinessEvent is not sent - PIN4 auto payment enabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2900,7 +2900,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2900
+
   Scenario: Verify that in case of non/disbursed loan LoanRepaymentDueBusinessEvent is not sent - PIN4 auto payment disabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2922,7 +2922,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2901 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that in case of non/disbursed loan LoanRepaymentDueBusinessEvent is not sent - PIN4 advanced payment allocation product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2944,7 +2944,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2902
+
   Scenario: Verify that in case of pre-payed installment LoanRepaymentDueBusinessEvent is not sent - PIN30 product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2965,7 +2965,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2903
+
   Scenario: Verify that in case of pre-payed installment LoanRepaymentDueBusinessEvent is not sent - PIN4 auto payment enabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -2989,7 +2989,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2904
+
   Scenario: Verify that in case of pre-payed installment LoanRepaymentDueBusinessEvent is not sent - PIN4 auto payment disabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -3013,7 +3013,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2905 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that in case of pre-payed installment LoanRepaymentDueBusinessEvent is not sent - PIN4 advanced payment allocation product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -3037,7 +3037,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2906
+
   Scenario: Verify that in case of pre-payed installments for total amount (loan balance is 0) LoanRepaymentDueBusinessEvent is not sent - PIN4 auto payment enabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -3067,7 +3067,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2907
+
   Scenario: Verify that in case of pre-payed installments for total amount (loan balance is 0) LoanRepaymentDueBusinessEvent is not sent - PIN4 auto payment disabled
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -3097,7 +3097,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2908 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that in case of pre-payed installments for total amount (loan balance is 0) LoanRepaymentDueBusinessEvent is not sent - PIN4 advanced payment allocation product
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -3127,7 +3127,7 @@
     When Admin runs inline COB job for Loan
     Then No new event with type "LoanRepaymentDueEvent" has been raised for the loan
 
-  @TestRailId:C2961
+
   Scenario: Verify that outstanding amounts are rounded correctly in case of: installmentAmountInMultiplesOf=1, interestType: FLAT, amortizationType: EQUAL_INSTALLMENTS
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
@@ -3147,7 +3147,7 @@
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In advance | Late | Outstanding |
       | 1250.0        | 62.50    | 0.0  | 0.0       | 1312.50 | 0.0  | 0.0        | 0.0  | 1312.50     |
 
-  @TestRailId:C2962
+
   Scenario: Verify that outstanding amounts are rounded correctly in case of: installmentAmountInMultiplesOf=1, interestType: DECLINING_BALANCE, amortizationType: EQUAL_INSTALLMENTS
     When Admin sets the business date to "01 September 2023"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanReschedule.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanReschedule.feature
index 345986c..db2d119 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanReschedule.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanReschedule.feature
@@ -1,7 +1,7 @@
 @LoanRescheduleFeature
 Feature: LoanReschedule
 
-  @TestRailId:C2680
+
   Scenario: As a user I would like to see a loan changed event was triggered when the loan got rescheduled
     When Admin sets the business date to "1 July 2022"
     When Admin creates a client with random data
@@ -14,7 +14,7 @@
       |    |      | 01 July 2022   |           | 5000.0          |               |          | 0.0  |           | 0.0    | 0.0  |            |      |             |
       | 1  | 61   | 31 August 2022 |           | 0.0             | 5000.0        | 0.0      | 0.0  | 0.0       | 5000.0 | 0.0  | 0.0        | 0.0  | 5000.0      |
 
-  @TestRailId:C2801
+
   Scenario: Verify that loan is rescheduled properly in case of: undo disbursement
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -38,7 +38,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 0    | 0          | 0    | 1000        |
 
-  @TestRailId:C2802
+
   Scenario: Verify that loan is rescheduled properly in case of: multiple disbursement, second disbursement placed within payment period
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -63,7 +63,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 0    | 0          | 0    | 1000        |
 
-  @TestRailId:C2803
+
   Scenario: Verify that loan is rescheduled properly in case of: multiple disbursement, second disbursement placed after payment period
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -97,7 +97,7 @@
       | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
       | 500           | 0        | 0    | 0         | 500 | 0    | 0          | 0    | 500         |
 
-  @TestRailId:C2804
+
   Scenario: Verify that loan is rescheduled properly in case of: single installment, changing installment date
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -123,7 +123,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 1000          | 0        | 0    | 0         | 1000 | 0    | 0          | 0    | 1000        |
 
-  @TestRailId:C2805
+
   Scenario: Verify that loan is rescheduled properly in case of: multiple installments, changing installment date
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -155,7 +155,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 0         | 3000 | 0    | 0          | 0    | 3000        |
 
-  @TestRailId:C2806
+
   Scenario: Verify that loan is rescheduled properly in case of: multiple installments, extending repayment schedule
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -189,7 +189,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 0        | 0    | 0         | 3000 | 0    | 0          | 0    | 3000        |
 
-  @TestRailId:C2807
+
   Scenario: Verify that loan is rescheduled properly in case of: multiple installments, mid-term grace period on principal
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -223,7 +223,7 @@
       | 3000          | 0        | 0    | 0         | 3000 | 0    | 0          | 0    | 3000        |
 
 #  TODO check and fix after Loan reschedule with graceOnInterest deletes all future interest portions when called from API was fixed (periods back to 3 or 5)
-  @Skip @TestRailId:C2808
+  @Skip
   Scenario: Verify that loan is rescheduled properly in case of: multiple installments, mid-term grace period on interest
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -255,7 +255,7 @@
 #      | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
 #      | 3000          | 30       | 0    | 0         | 3030 | 0    | 0          | 0    | 3030        |
 
-  @TestRailId:C2809
+
   Scenario: Verify that loan is rescheduled properly in case of: multiple installments, new interest rate
     When Admin sets the business date to "01 July 2023"
     When Admin creates a client with random data
@@ -287,7 +287,7 @@
       | Principal due | Interest | Fees | Penalties | Due  | Paid | In advance | Late | Outstanding |
       | 3000          | 60       | 0    | 0         | 3060 | 0    | 0          | 0    | 3060        |
 
-  @TestRailId:C2996
+
   Scenario: Verify that reschedule: add extra terms working properly with auto downpayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -312,7 +312,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 250.0 | 0.0        | 0.0  | 750.0       |
 
-  @TestRailId:C2997
+
   Scenario: Verify that reschedule: add extra terms working properly with auto downpayment and 2nd disbursement before reschedule
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -344,7 +344,7 @@
 
 #    TODO remove Skip when Reschedule does not work properly in case of PIN4_DOWNPAYMENT_AUTO and with 2nd disbursement after reschedule and first installment is fixed
   @Skip
-  @TestRailId:C2998
+
   Scenario: Verify that reschedule: add extra terms working properly with auto downpayment and 2nd disbursement after reschedule and first installment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -374,7 +374,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late  | Outstanding |
       | 1400.0        | 0.0      | 0.0  | 0.0       | 1400.0 | 350.0 | 0.0        | 100.0 | 1050.0      |
 
-  @TestRailId:C3022
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of loan schedule adjusted by 1 installment period after successful downpayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -398,7 +398,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 250.0 | 0.0        | 0.0  | 750.0       |
 
-  @TestRailId:C3023
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of loan schedule adjusted by 2 installment period after successful downpayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -422,7 +422,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 250.0 | 0.0        | 0.0  | 750.0       |
 
-  @TestRailId:C3024
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of loan schedule adjusted by 2 installment period while downpayment is still due
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -446,7 +446,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 0.0  | 0.0        | 0.0  | 1000.0      |
 
-  @TestRailId:C3025
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of loan schedule adjusted by 1 installment period after downpayment was reverted, fee added and downpayment paid by autopayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -481,7 +481,7 @@
       | 01 October 2023  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        | true     |
       | 03 October 2023  | Repayment        | 250.0  | 250.0     | 0.0      | 0.0  | 0.0       | 750.0        | false    |
 
-  @TestRailId:C3026
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of auto downpayment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -504,7 +504,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 250.0 | 0.0        | 0.0  | 750.0       |
 
-  @TestRailId:C3027
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of auto downpayment and 2nd disbursement before reschedule
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -532,7 +532,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1400.0        | 0.0      | 0.0  | 0.0       | 1400.0 | 350.0 | 0.0        | 0.0  | 1050.0      |
 
-  @TestRailId:C3028
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of loan schedule adjusted by 1 installment period and 2 extra terms
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -558,7 +558,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 250.0 | 0.0        | 0.0  | 750.0       |
 
-  @TestRailId:C3029
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) works properly in case of loan schedule adjusted by 1 installment period and 1 grace on principal
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -583,7 +583,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 0.0       | 1000.0 | 250.0 | 0.0        | 0.0  | 750.0       |
 
-  @TestRailId:C3030
+
   Scenario: Verify that Payment Holiday (Reschedule with adjustedDueDate) gives error in case of charged-off loan
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -599,7 +599,7 @@
       | rescheduleFromDate | submittedOnDate | adjustedDueDate | graceOnPrincipal | graceOnInterest | extraTerms | newInterestRate |
       | 16 October 2023    | 05 October 2023 | 31 October 2023 | 0                | 0               | 0          | 0               |
 
-  @TestRailId:C3033
+
   Scenario: Verify that reschedule keeps the N+1 installment
     When Admin sets the business date to "01 October 2023"
     When Admin creates a client with random data
@@ -636,7 +636,7 @@
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In advance | Late | Outstanding |
       | 1000.0        | 0.0      | 0.0  | 20.0      | 1020.0 | 0.0  | 0.0        | 0.0  | 1020.0      |
 
-  @TestRailId:C3045 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that inline COB execution is taking place in case of a BatchAPI request of Loan reschedule creation and approval
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
@@ -657,7 +657,7 @@
     When Batch API call with created user and with steps: rescheduleLoan from "16 January 2024" to "31 January 2024" submitted on date: "10 January 2024", approveReschedule on date: "10 January 2024" runs with enclosingTransaction: "true"
     Then Admin checks that last closed business date of loan is "09 January 2024"
 
-  @TestRailId:C3048 @AdvancedPaymentAllocation
+   @AdvancedPaymentAllocation
   Scenario: Verify that in case of Loan is hard locked for COB execution, BatchAPI request of Loan reschedule creation and approval will result a 409 error and a LOAN_LOCKED_BY_COB error message
     When Admin sets the business date to "01 January 2024"
     When Admin creates a client with random data
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanWriteOff.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanWriteOff.feature
index cd76727..fa44d1e 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanWriteOff.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanWriteOff.feature
@@ -1,7 +1,7 @@
 @WriteOffFeature
   Feature: Write-off
 
-    @TestRailId:C2934
+
     Scenario: As a user I want to do Write-off a loan and verify that undo repayment post write-off results in error
       When Admin sets the business date to "1 January 2023"
       And Admin creates a client with random data
@@ -21,7 +21,7 @@
       Then Admin fails to undo "1"th transaction made on "22 January 2023"
 
 
-    @TestRailId:C2935
+
     Scenario: As a user I want to do Write-off a loan and verify that backdate repayment post write-off results in error
       When Admin sets the business date to "1 January 2023"
       And Admin creates a client with random data
@@ -41,7 +41,7 @@
       Then Loan "AUTOPAY" repayment transaction on "26 January 2023" with 50 EUR transaction amount results in error
 
 
-    @TestRailId:C2936
+
     Scenario: As a user I want to do Write-off a loan and verify that undo write-off results in error
       When Admin sets the business date to "1 January 2023"
       And Admin creates a client with random data