diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index 1b1a78bec..d7dd72abb 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -107,7 +107,7 @@ class SeleniumSIDETest extends Specification {
 
         where:
         name                                                                | file
-/*        'SHIBUI-1364: Compare FBHTTPMP with filters'                        | '/SHIBUI-1364-1.side'
+        'SHIBUI-1364: Compare FBHTTPMP with filters'                        | '/SHIBUI-1364-1.side'
         'SHIBUI-1364: Compare FSMP'                                         | '/SHIBUI-1364-2.side'
         'SHIBUI-1364: Compare LDMP'                                         | '/SHIBUI-1364-3.side'
         'SHIBUI-1364: Compare DHTTPMP with filters'                         | '/SHIBUI-1364-4.side'
@@ -116,9 +116,9 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-950: Metadata Source from XML w/ digest'                    | '/SHIBUI-950.side'
         'SHIBUI-1352: Create LocalDynamic provider'                         | '/SHIBUI-1352-1.side'
         'SHIBUI-1352: Create FileSystem provider'                           | '/SHIBUI-1352-2.side'
-        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'*/
+        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'
         'SHIBUI-1334: Verify metadata source versioning'                    | '/SHIBUI-1334-1.side'
-/*        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
+        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
         'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
         'SHIBUI-1335: Verify Filesystem Metadata Provider'                  | '/SHIBUI-1335-2.side'
         'SHIBUI-1335: Verify Local Dynamic Metadata Provider'               | '/SHIBUI-1335-3.side'
@@ -161,6 +161,6 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-2270: Verify property set CRUD'                             | '/SHIBUI-2270-1.side'
         'SHIBUI-2270: Verify full property set'                             | '/SHIBUI-2270-2.side'
         'SHIBUI-2268: Verify Algorithm Filter'                              | '/SHIBUI-2268.side'
-        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'*/
+        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
index 43178ab01..7d3b47a31 100644
--- a/backend/src/integration/resources/SHIBUI-1385-1.side
+++ b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -811,11 +811,12 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[5]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4",
       "targets": [
-        ["css=.focus", "css:finder"],
-        ["xpath=(//input[@value=''])[9]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[5]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[4]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "somethingElse"
@@ -1013,16 +1014,29 @@
         ["xpath=//div[2]/div/div/div/input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "a9f38744-ba6b-4722-a3c8-c93aa3d51e42",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "3e11e54a-1b36-43ed-a8e5-d91f1fbed991",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_0_name",
+      "target": "id=root_securityInfo_keyDescriptors_0_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_0_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
@@ -1030,12 +1044,12 @@
       "id": "5acb8e19-16a3-4139-a961-1b58c11c4681",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_0_name",
+      "target": "id=root_securityInfo_keyDescriptors_0_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_0_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "Cert 1 Name"
@@ -1043,26 +1057,26 @@
       "id": "23ff8b87-ac6c-4f82-a779-aa91be11f49c",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_0_type-signing",
+      "target": "id=root_securityInfo_keyDescriptors_0_type-signing",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_type-signing", "id"],
-        ["name=root_securityInfo_x509Certificates_0_type", "name"],
-        ["css=#root_securityInfo_x509Certificates_0_type-signing", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_type-signing']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[2]/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/div/input", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_0_type-signing", "id"],
+        ["name=root_securityInfo_keyDescriptors_0_type", "name"],
+        ["css=#root_securityInfo_keyDescriptors_0_type-signing", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_0_type-signing']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[3]/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "dd15088c-ddc9-42fd-8f8d-f73338be71b6",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_0_value",
+      "target": "id=root_securityInfo_keyDescriptors_0_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_0_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_0_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
         ["xpath=//textarea", "xpath:position"]
       ],
       "value": ""
@@ -1070,12 +1084,12 @@
       "id": "813bf709-6c73-41ac-837a-5be076fa43c7",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_0_value",
+      "target": "id=root_securityInfo_keyDescriptors_0_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_0_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_0_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
         ["xpath=//textarea", "xpath:position"]
       ],
       "value": "This is cert 1."
@@ -1096,12 +1110,12 @@
       "id": "cbe577f6-3d18-49d9-95ab-2e597e5308a6",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_1_name",
+      "target": "id=root_securityInfo_keyDescriptors_1_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_1_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_1_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_1_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_1_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_1_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
@@ -1109,12 +1123,12 @@
       "id": "ae98e813-77f4-424e-9141-d48e6127d9b6",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_1_name",
+      "target": "id=root_securityInfo_keyDescriptors_1_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_1_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_1_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_1_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_1_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_1_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "Cert 2 Name"
@@ -1122,39 +1136,39 @@
       "id": "835ad053-0a10-4606-a148-c7ba36be316f",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_1_type-encryption",
+      "target": "id=root_securityInfo_keyDescriptors_1_type-encryption",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_1_type-encryption", "id"],
-        ["css=#root_securityInfo_x509Certificates_1_type-encryption", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_1_type-encryption']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[2]/div/div/div/div/div[2]/input", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[2]/div/div/div/div/div[2]/input", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_type-encryption", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_type-encryption", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_1_type-encryption']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/div[2]/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/div[2]/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "e272cafa-3aba-4aff-972e-b1d45e627b88",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_1_value",
+      "target": "id=root_securityInfo_keyDescriptors_1_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_1_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_1_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_1_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_1_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "ae42d668-92ba-4cb8-9daf-a2a64ac18404",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_1_value",
+      "target": "id=root_securityInfo_keyDescriptors_1_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_1_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_1_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_1_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_1_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:position"]
       ],
       "value": "This is cert 2."
     }, {
@@ -1661,11 +1675,12 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4",
       "targets": [
-        ["css=.focus", "css:finder"],
-        ["xpath=(//input[@value=''])[10]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[8]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
@@ -1673,13 +1688,13 @@
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4",
       "targets": [
-        ["id=field83", "id"],
-        ["css=#field83", "css:finder"],
-        ["xpath=//input[@id='field83']", "xpath:attributes"],
-        ["xpath=//div[@id='field83-container']/div/input", "xpath:idRelative"],
-        ["xpath=//li[5]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "somethingElse"
     }, {
@@ -1721,12 +1736,13 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/0-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1772,12 +1788,13 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "xpath=//div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/1-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[2]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[2]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1823,12 +1840,13 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/2-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1870,26 +1888,26 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3",
       "targets": [
-        ["id=/relyingPartyOverrides/authenticationMethods/3", "id"],
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/3", "css:finder"],
-        ["xpath=//input[@id='/relyingPartyOverrides/authenticationMethods/3']", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/3-container']/div/input", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3",
       "targets": [
-        ["id=field87", "id"],
-        ["css=#field87", "css:finder"],
-        ["xpath=//input[@id='field87']", "xpath:attributes"],
-        ["xpath=//div[@id='field87-container']/div/input", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "otherThings"
     }, {
@@ -1954,11 +1972,11 @@
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(2) > div:nth-child(2) > .border-bottom > .text-truncate",
+      "target": "css=div:nth-child(2) > div:nth-child(3) > .border-bottom > .text-truncate",
       "targets": [
-        ["css=div:nth-child(2) > div:nth-child(2) > .border-bottom > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section/div/div[2]/div[2]/div[2]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(2) > div:nth-child(3) > .border-bottom > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"]
       ],
       "value": "test-1234"
@@ -2048,7 +2066,7 @@
       ],
       "value": "test-1234"
     }, {
-      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "id": "5a83524d-ccbb-4be2-b5d0-969184b9cb4e",
       "comment": "",
       "command": "assertText",
       "target": "css=td:nth-child(3)",
@@ -2057,6 +2075,17 @@
         ["xpath=//td[3]", "xpath:position"],
         ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
       ],
+      "value": "SAML"
+    }, {
+      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(4)",
+      "targets": [
+        ["css=td:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
+      ],
       "value": "admin"
     }, {
       "id": "87281e0a-322f-4d3a-9703-3e6966f26759",
@@ -2191,11 +2220,11 @@
       "id": "16271513-203c-4528-870f-dcf73f4d81cb",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate",
+      "target": "css=div:nth-child(2) > div:nth-child(3) > .d-flex > .text-truncate",
       "targets": [
-        ["css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[2]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(2) > div:nth-child(3) > .d-flex > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"]
       ],
       "value": "test-1234"
@@ -2203,10 +2232,10 @@
       "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block",
+      "target": "css=div:nth-child(6) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block",
       "targets": [
-        ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"],
+        ["css=div:nth-child(6) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[6]/div[2]/div[3]/span", "xpath:idRelative"],
         ["xpath=//div[3]/span", "xpath:position"],
         ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"]
       ],
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
index dea518e4a..d8ff784a9 100644
--- a/backend/src/integration/resources/SHIBUI-1407-1.side
+++ b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -804,13 +804,13 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[5]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4",
       "targets": [
-        ["id=field34", "id"],
-        ["css=#field34", "css:finder"],
-        ["xpath=//input[@id='field34']", "xpath:attributes"],
-        ["xpath=//div[@id='field34-container']/div/input", "xpath:idRelative"],
-        ["xpath=//li[5]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[4]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "somethingElse"
     }, {
@@ -1007,16 +1007,29 @@
         ["xpath=//div[2]/div/div/div/input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "b6b3051b-c11e-468f-8f7c-d4fde7bddfcb",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "3e11e54a-1b36-43ed-a8e5-d91f1fbed991",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_0_name",
+      "target": "id=root_securityInfo_keyDescriptors_0_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_0_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
@@ -1024,12 +1037,12 @@
       "id": "5acb8e19-16a3-4139-a961-1b58c11c4681",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_0_name",
+      "target": "id=root_securityInfo_keyDescriptors_0_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_0_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "Cert 1 Name"
@@ -1037,26 +1050,26 @@
       "id": "23ff8b87-ac6c-4f82-a779-aa91be11f49c",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_0_type-signing",
+      "target": "id=root_securityInfo_keyDescriptors_0_type-signing",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_type-signing", "id"],
-        ["name=root_securityInfo_x509Certificates_0_type", "name"],
-        ["css=#root_securityInfo_x509Certificates_0_type-signing", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_type-signing']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[2]/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/div/input", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_0_type-signing", "id"],
+        ["name=root_securityInfo_keyDescriptors_0_type", "name"],
+        ["css=#root_securityInfo_keyDescriptors_0_type-signing", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_0_type-signing']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[3]/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "dd15088c-ddc9-42fd-8f8d-f73338be71b6",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_0_value",
+      "target": "id=root_securityInfo_keyDescriptors_0_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_0_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_0_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
         ["xpath=//textarea", "xpath:position"]
       ],
       "value": ""
@@ -1064,12 +1077,12 @@
       "id": "813bf709-6c73-41ac-837a-5be076fa43c7",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_0_value",
+      "target": "id=root_securityInfo_keyDescriptors_0_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_0_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["id=root_securityInfo_keyDescriptors_0_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_0_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_0_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
         ["xpath=//textarea", "xpath:position"]
       ],
       "value": "This is cert 1."
@@ -1090,65 +1103,65 @@
       "id": "cbe577f6-3d18-49d9-95ab-2e597e5308a6",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_1_name",
+      "target": "id=root_securityInfo_keyDescriptors_1_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_1_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "ae98e813-77f4-424e-9141-d48e6127d9b6",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_1_name",
+      "target": "id=root_securityInfo_keyDescriptors_1_name",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_name", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_name", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_name']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_name", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_name", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_1_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "Cert 2 Name"
     }, {
       "id": "835ad053-0a10-4606-a148-c7ba36be316f",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_1_type-encryption",
+      "target": "id=root_securityInfo_keyDescriptors_1_type-encryption",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_type-encryption", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_type-encryption", "css:finder"],
-        ["xpath=//input[@id='root_securityInfo_x509Certificates_0_type-encryption']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[2]/div/div/div/div/div[2]/input", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/div[2]/input", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_type-encryption", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_type-encryption", "css:finder"],
+        ["xpath=//input[@id='root_securityInfo_keyDescriptors_1_type-encryption']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/div[2]/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/div[2]/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "e272cafa-3aba-4aff-972e-b1d45e627b88",
       "comment": "",
       "command": "click",
-      "target": "id=root_securityInfo_x509Certificates_1_value",
+      "target": "id=root_securityInfo_keyDescriptors_1_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_0_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
-        ["xpath=//textarea", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_1_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "ae42d668-92ba-4cb8-9daf-a2a64ac18404",
       "comment": "",
       "command": "type",
-      "target": "id=root_securityInfo_x509Certificates_1_value",
+      "target": "id=root_securityInfo_keyDescriptors_1_value",
       "targets": [
-        ["id=root_securityInfo_x509Certificates_0_value", "id"],
-        ["css=#root_securityInfo_x509Certificates_0_value", "css:finder"],
-        ["xpath=//textarea[@id='root_securityInfo_x509Certificates_0_value']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[7]/div/div/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div[2]/div/div/div/div/div[3]/div/div/div/div/textarea", "xpath:idRelative"],
-        ["xpath=//textarea", "xpath:position"]
+        ["id=root_securityInfo_keyDescriptors_1_value", "id"],
+        ["css=#root_securityInfo_keyDescriptors_1_value", "css:finder"],
+        ["xpath=//textarea[@id='root_securityInfo_keyDescriptors_1_value']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[6]/div/div/div/div/div/div[3]/div/div/div/div[2]/div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div[2]/div/div/div/div/div[4]/div/div/div/div/textarea", "xpath:position"]
       ],
       "value": "This is cert 2."
     }, {
@@ -1655,26 +1668,26 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4",
       "targets": [
-        ["id=/relyingPartyOverrides/nameIdFormats/4", "id"],
-        ["css=#\\/relyingPartyOverrides\\/nameIdFormats\\/4", "css:finder"],
-        ["xpath=//input[@id='/relyingPartyOverrides/nameIdFormats/4']", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/nameIdFormats/4-container']/div/input", "xpath:idRelative"],
-        ["xpath=//li[5]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4",
       "targets": [
-        ["id=field83", "id"],
-        ["css=#field83", "css:finder"],
-        ["xpath=//input[@id='field83']", "xpath:attributes"],
-        ["xpath=//div[@id='field83-container']/div/input", "xpath:idRelative"],
-        ["xpath=//li[5]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "somethingElse"
     }, {
@@ -1723,12 +1736,13 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/0-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1777,12 +1791,13 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/1-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[2]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[2]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1831,12 +1846,13 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/2-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1878,26 +1894,26 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3",
       "targets": [
-        ["id=/relyingPartyOverrides/authenticationMethods/3", "id"],
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/3", "css:finder"],
-        ["xpath=//input[@id='/relyingPartyOverrides/authenticationMethods/3']", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/3-container']/div/input", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3",
       "targets": [
-        ["id=field87", "id"],
-        ["css=#field87", "css:finder"],
-        ["xpath=//input[@id='field87']", "xpath:attributes"],
-        ["xpath=//div[@id='field87-container']/div/input", "xpath:idRelative"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3", "id"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "otherThings"
     }, {
@@ -1971,11 +1987,11 @@
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate",
+      "target": "css=div:nth-child(2) > div:nth-child(3) > .border-bottom > .text-truncate",
       "targets": [
-        ["css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section/div/div[2]/div[2]/div[2]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(2) > div:nth-child(3) > .border-bottom > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"]
       ],
       "value": "test-1234"
@@ -2062,7 +2078,7 @@
       ],
       "value": "test-1234"
     }, {
-      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "id": "37636c97-2c2b-4fe8-978b-8bb19430b361",
       "comment": "",
       "command": "assertText",
       "target": "css=td:nth-child(3)",
@@ -2071,6 +2087,18 @@
         ["xpath=//td[3]", "xpath:position"],
         ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
       ],
+      "value": "SAML"
+    }, {
+      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(4)",
+      "targets": [
+        ["css=.align-middle:nth-child(4)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[4]", "xpath:idRelative"],
+        ["xpath=//td[4]", "xpath:position"],
+        ["xpath=//td[contains(.,'admin')]", "xpath:innerText"]
+      ],
       "value": "admin"
     }, {
       "id": "fbcf1587-cb27-4deb-80c6-78b4d4aa2478",
@@ -2188,11 +2216,11 @@
       "id": "16271513-203c-4528-870f-dcf73f4d81cb",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate",
+      "target": "css=div:nth-child(2) > div:nth-child(3) > .d-flex > .text-truncate",
       "targets": [
-        ["css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[2]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(2) > div:nth-child(3) > .d-flex > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"]
       ],
       "value": "test-1234"
@@ -2200,10 +2228,10 @@
       "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block",
+      "target": "css=div:nth-child(6) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block",
       "targets": [
-        ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"],
+        ["css=div:nth-child(6) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[6]/div[2]/div[3]/span", "xpath:idRelative"],
         ["xpath=//div[3]/span", "xpath:position"],
         ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"]
       ],
@@ -2248,11 +2276,12 @@
       "id": "fe47ffd2-d2a0-4264-90fe-31b998f81ac2",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(7) .p-2 > div > div > div:nth-child(3) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(7) div:nth-child(1) > .d-flex > .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(7) .p-2 > div > div > div:nth-child(3) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[5]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[5]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:position"]
+        ["css=.mb-4:nth-child(7) div:nth-child(1) > .d-flex > .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[5]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[5]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1503-1.side b/backend/src/integration/resources/SHIBUI-1503-1.side
index e8c611e9e..cb0be998d 100644
--- a/backend/src/integration/resources/SHIBUI-1503-1.side
+++ b/backend/src/integration/resources/SHIBUI-1503-1.side
@@ -488,8 +488,14 @@
       "id": "9be511e0-ed11-4707-8490-6fa248e4138e",
       "comment": "",
       "command": "assertNotChecked",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
-      "targets": [],
+      "target": "xpath=//span/div/input",
+      "targets": [
+        ["id=enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "id"],
+        ["css=#enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "css:finder"],
+        ["xpath=//input[@id='enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
+      ],
       "value": ""
     }, {
       "id": "157e70d6-fa1c-4118-bce4-ab52000b6c16",
@@ -539,10 +545,11 @@
       "id": "6ba5a2fb-8c68-4743-99d6-1fa44644f399",
       "comment": "",
       "command": "assertText",
-      "target": "css=td:nth-child(3)",
+      "target": "css=td:nth-child(4)",
       "targets": [
-        ["css=td:nth-child(3)", "css:finder"],
-        ["xpath=//td[3]", "xpath:position"],
+        ["css=.align-middle:nth-child(4)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[4]", "xpath:idRelative"],
+        ["xpath=//td[4]", "xpath:position"],
         ["xpath=//td[contains(.,'nonadmin')]", "xpath:innerText"]
       ],
       "value": "nonadmin"
@@ -550,11 +557,13 @@
       "id": "eb63aa9f-4ac5-4852-8941-740b9f49a769",
       "comment": "",
       "command": "click",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "target": "xpath=//input",
       "targets": [
-        ["css=.custom-control-label", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[5]/span/div/label", "xpath:idRelative"],
-        ["xpath=//label", "xpath:position"]
+        ["id=enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "id"],
+        ["css=#enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "css:finder"],
+        ["xpath=//input[@id='enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -600,9 +609,29 @@
       "id": "f76a12a3-2054-4be2-a6a6-2221afd493fb",
       "comment": "",
       "command": "assertChecked",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
-      "targets": [],
+      "target": "xpath=//span/div/input",
+      "targets": [
+        ["id=enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "id"],
+        ["css=#enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "css:finder"],
+        ["xpath=//input[@id='enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
+      ],
       "value": "Enabled"
+    }, {
+      "id": "6288b2e8-6cec-4fa9-9f34-a9a39c79bbb0",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "bedd3f8c-501e-4d66-acf3-95ded657db44",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
index e2c62c188..f57151faf 100644
--- a/backend/src/integration/resources/SHIBUI-1674-1.side
+++ b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -119,16 +119,16 @@
       "id": "93d20204-7dfa-44c0-8e61-6741e73594f5",
       "comment": "",
       "command": "waitForElementPresent",
-      "target": "css=.mb-3:nth-child(2) .btn path",
+      "target": "css=.mb-3:nth-child(3) .info-icon path",
       "targets": [],
       "value": "30000"
     }, {
       "id": "a7b2b925-2274-4dcc-a4e3-3b727c9a047a",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.mb-3:nth-child(2) .btn path",
+      "target": "css=.mb-3:nth-child(3) .info-icon path",
       "targets": [
-        ["css=.mb-3:nth-child(2) .btn path", "css:finder"]
+        ["css=.mb-3:nth-child(3) .info-icon path", "css:finder"]
       ],
       "value": ""
     }, {
@@ -385,11 +385,9 @@
       "id": "54a74399-69aa-4412-85c2-a5bbb543d8be",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(8) path:nth-child(1)",
+      "target": "css=.row:nth-child(9) path:nth-child(1)",
       "targets": [
-        ["css=.app-root", "css:finder"],
-        ["xpath=//div[@id='root']/div", "xpath:idRelative"],
-        ["xpath=//div[3]/div", "xpath:position"]
+        ["css=.row:nth-child(9) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -721,9 +719,9 @@
       "id": "2928ba27-b934-499e-8dda-8441dbbb463d",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(7) path:nth-child(1)",
+      "target": "css=.row:nth-child(8) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(7) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(8) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1742-1.side b/backend/src/integration/resources/SHIBUI-1742-1.side
index 09985e641..80328ee7b 100644
--- a/backend/src/integration/resources/SHIBUI-1742-1.side
+++ b/backend/src/integration/resources/SHIBUI-1742-1.side
@@ -119,8 +119,8 @@
     }, {
       "id": "21ab7479-9782-4b44-a169-732c957c6d01",
       "comment": "",
-      "command": "waitForElementNotVisible",
-      "target": "xpath=//div[@role=\"alert\"]",
+      "command": "assertElementPresent",
+      "target": "css=.alert",
       "targets": [],
       "value": "30000"
     }, {
@@ -510,11 +510,13 @@
       "id": "9585df73-48e3-4ca3-b13c-74ecdee11461",
       "comment": "",
       "command": "click",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "target": "xpath=//span/div/input",
       "targets": [
-        ["css=.justify-content-center", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[5]/span", "xpath:idRelative"],
-        ["xpath=//td[5]/span", "xpath:position"]
+        ["id=enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "id"],
+        ["css=#enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "css:finder"],
+        ["xpath=//input[@id='enable-switch-758810ff-8c20-4145-ab70-05e981f78027']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -591,35 +593,41 @@
       "id": "4bdddea6-4e3d-4947-a1cc-b05a795d56c5",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
-      "targets": [],
+      "target": "xpath=//span/div/input",
+      "targets": [
+        ["id=enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "id"],
+        ["css=#enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "css:finder"],
+        ["xpath=//input[@id='enable-switch-758810ff-8c20-4145-ab70-05e981f78027']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
+      ],
       "value": "3000"
     }, {
       "id": "79423a30-b82b-443f-b0ea-80370a6d397b",
       "comment": "",
       "command": "assertChecked",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "target": "xpath=//span/div/input",
       "targets": [
         ["css=.custom-control-label", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[5]/span/div/label", "xpath:idRelative"],
         ["xpath=//span/div/label", "xpath:position"]
       ],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "8a97286b-5660-452c-9f23-4c5f5bf8de3b",
diff --git a/backend/src/integration/resources/SHIBUI-2267.side b/backend/src/integration/resources/SHIBUI-2267.side
index ac4919662..d1fd93f87 100644
--- a/backend/src/integration/resources/SHIBUI-2267.side
+++ b/backend/src/integration/resources/SHIBUI-2267.side
@@ -310,7 +310,7 @@
       ],
       "value": "test-1234"
     }, {
-      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "id": "83491735-f305-45f9-922c-697ac167c4e6",
       "comment": "",
       "command": "assertText",
       "target": "css=td:nth-child(3)",
@@ -319,6 +319,17 @@
         ["xpath=//td[3]", "xpath:position"],
         ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
       ],
+      "value": "SAML"
+    }, {
+      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(4)",
+      "targets": [
+        ["css=td:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
+      ],
       "value": "admin"
     }, {
       "id": "549253bc-b6e0-4968-8058-f52700e9e3b2",