diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
index d52d9ab36d..50ca44c94a 100644
--- a/Jenkinsfile_CNP
+++ b/Jenkinsfile_CNP
@@ -193,6 +193,10 @@ withPipeline(type, product, component) {
     uploadCoreCaseDataDefinitions('staging')
   }
 
+  before('functionalTest:aat') {
+    env.IDAM_STUB_ENABLED=false
+  }
+
   afterAlways('smoketest:aat') {
     steps.archiveArtifacts allowEmptyArchive: true, artifacts: 'test-results/smokeTest/**/*'
   }
diff --git a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-nonprod.json b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-nonprod.json
deleted file mode 100644
index 4a9b6ee417..0000000000
--- a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-nonprod.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "PENDING_CASE_ISSUED",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "caseworker-ras-validation",
-          "GS_profile"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT",
-    "UserRoles": [
-      "caseworker-ras-validation",
-      "GS_profile"
-    ],
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "AWAITING_APPLICANT_INTENTION",
-    "UserRoles": [
-      "caseworker-ras-validation",
-      "GS_profile"
-    ],
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "CASE_DISMISSED",
-    "UserRoles": [
-      "caseworker-ras-validation",
-      "GS_profile"
-    ],
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "PROCEEDS_IN_HERITAGE_SYSTEM",
-    "UserRoles": [
-      "caseworker-ras-validation",
-      "GS_profile"
-    ],
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "CASE_ISSUED",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "caseworker-ras-validation",
-          "GS_profile"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "AWAITING_CASE_DETAILS_NOTIFICATION",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "caseworker-ras-validation",
-          "GS_profile"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "HEARING_READINESS",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "judge-profile",
-          "hearing-schedule-access",
-          "caseworker-civil-admin",
-          "caseworker-civil-solicitor"
-        ],
-        "CRUD": "CRU"
-      },
-      {
-        "UserRoles": [
-          "caseworker-ras-validation",
-          "GS_profile"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseStateID": "PREPARE_FOR_HEARING_CONDUCT_HEARING",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "judge-profile",
-          "hearing-schedule-access",
-          "caseworker-civil-admin",
-          "caseworker-civil-solicitor"
-        ],
-        "CRUD": "CRU"
-      },
-      {
-        "UserRoles": [
-          "caseworker-ras-validation",
-          "GS_profile"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  }
-]
diff --git a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState.json b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState.json
index 8985673f70..499decfbf0 100644
--- a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState.json
+++ b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState.json
@@ -151,5 +151,124 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "PENDING_CASE_ISSUED",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-ras-validation",
+          "GS_profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT",
+    "UserRoles": [
+      "caseworker-ras-validation",
+      "GS_profile"
+    ],
+    "CRUD": "R"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "AWAITING_APPLICANT_INTENTION",
+    "UserRoles": [
+      "caseworker-ras-validation",
+      "GS_profile"
+    ],
+    "CRUD": "R"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "CASE_DISMISSED",
+    "UserRoles": [
+      "caseworker-ras-validation",
+      "GS_profile"
+    ],
+    "CRUD": "R"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "PROCEEDS_IN_HERITAGE_SYSTEM",
+    "UserRoles": [
+      "caseworker-ras-validation",
+      "GS_profile"
+    ],
+    "CRUD": "R"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "CASE_ISSUED",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-ras-validation",
+          "GS_profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "AWAITING_CASE_DETAILS_NOTIFICATION",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-ras-validation",
+          "GS_profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "HEARING_READINESS",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "judge-profile",
+          "hearing-schedule-access",
+          "caseworker-civil-admin",
+          "caseworker-civil-solicitor"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-ras-validation",
+          "GS_profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseStateID": "PREPARE_FOR_HEARING_CONDUCT_HEARING",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "judge-profile",
+          "hearing-schedule-access",
+          "caseworker-civil-admin",
+          "caseworker-civil-solicitor"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-ras-validation",
+          "GS_profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
   }
 ]
diff --git a/codecept.conf.js b/codecept.conf.js
index 651d9ab36b..67f0671e73 100644
--- a/codecept.conf.js
+++ b/codecept.conf.js
@@ -1,10 +1,10 @@
 exports.config = {
   tests: [
     './e2e/tests/*_test.js',
+    './e2e/tests/api_tests/defaultJudgments/*_test.js',
     './e2e/tests/api_tests/damages/*_test.js',
     './e2e/tests/api_tests/lrspec/*_test.js',
     './e2e/tests/api_tests/lrspec_cui/*_test.js',
-    './e2e/tests/api_tests/defaultJudgments/*_test.js',
     './e2e/tests/api_tests/sdo/*_test.js',
     './e2e/tests/ui_tests/damages/*_test.js',
     './e2e/tests/ui_tests/damages/nightly/*_test.js',
diff --git a/e2e/steps_file.js b/e2e/steps_file.js
index 0326cb9858..c1e4a94133 100644
--- a/e2e/steps_file.js
+++ b/e2e/steps_file.js
@@ -227,7 +227,7 @@ module.exports = function () {
           this.amOnPage(config.url.manageCase, 90);
 
           if (!config.idamStub.enabled || config.idamStub.enabled === 'false') {
-            output.log(`Signing in user: ${user.type}`);
+            console.log(`Signing in user: ${user.type}`);
             await loginPage.signIn(user);
           }
         }, SIGNED_IN_SELECTOR);
diff --git a/package.json b/package.json
index af3918a871..e3158e3f4e 100644
--- a/package.json
+++ b/package.json
@@ -50,8 +50,8 @@
     "test:fullfunctional": "./e2e/run-features-flag-enabled-full-functional-tests.sh",
     "test:e2e-nightly-prod": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 2 --grep '@e2e-nightly-prod' --reporter mocha-multi --verbose",
     "test:e2e-nightly-nonprod": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 2 --grep '@e2e-nightly-nonprod' --reporter mocha-multi --verbose",
-    "test:non-prod-e2e-ft": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 2 --grep '@master-e2e-ft|@non-prod-e2e-ft' --reporter mocha-multi --verbose",
-    "test:master-e2e-ft": "MOCHAWESOME_REPORTFILENAME=master-e2e-ft npx codeceptjs run-workers --suites 2 --grep @master-e2e-ft --reporter mocha-multi --verbose",
+    "test:non-prod-e2e-ft": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 3 --grep '@master-e2e-ft|@non-prod-e2e-ft' --reporter mocha-multi --verbose",
+    "test:master-e2e-ft": "MOCHAWESOME_REPORTFILENAME=master-e2e-ft npx codeceptjs run-workers --suites 3 --grep @master-e2e-ft --reporter mocha-multi --verbose",
     "test:functional": "./e2e/run-functional-tests.sh",
     "test:sdo": "MOCHAWESOME_REPORTFILENAME=functional npx codeceptjs run --grep @sdo --reporter mocha-multi --verbose",
     "generate-dev": "./bin/build-release-ccd-definition.sh local",