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 02327b4f7..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'
@@ -153,14 +153,14 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side'
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
-        'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'*/
+        'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'
         'SHIBUI-2380: OIDC metadata source CRUD'                            | '/SHIBUI-2380.side'
-/*        'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
+        'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
         'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
         'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
         '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-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
index b93b517c5..dba5fdfc0 100644
--- a/backend/src/integration/resources/SHIBUI-1333.side
+++ b/backend/src/integration/resources/SHIBUI-1333.side
@@ -2290,11 +2290,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(8) .text-truncate",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(8) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[8]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index 0526e3672..28458a417 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2022,13 +2022,13 @@
       "id": "43b130ff-e8a5-493d-a418-f1f8623f1de3",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(10) .text-truncate",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=div:nth-child(10) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[10]/div/span[2]", "xpath:position"]
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"]
       ],
-      "value": "true"
+      "value": "false"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
@@ -2312,11 +2312,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(8) .text-truncate",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(8) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[8]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side
index aa2c983f8..3230fed42 100644
--- a/backend/src/integration/resources/SHIBUI-1335-1.side
+++ b/backend/src/integration/resources/SHIBUI-1335-1.side
@@ -1763,7 +1763,7 @@
       "id": "febfcea8-8f72-4a17-b1a8-b1e323c8cced",
       "comment": "",
       "command": "pause",
-      "target": "2000",
+      "target": "3000",
       "targets": [],
       "value": ""
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
index 2383c5172..a81d2a2f2 100644
--- a/backend/src/integration/resources/SHIBUI-1385-1.side
+++ b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -1775,6 +1775,13 @@
         ["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/ul/li", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "56bd1406-bbc0-4610-961c-c1866e822d70",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
     }, {
       "id": "ed769470-9c3f-4c23-bbed-85513dcea800",
       "comment": "",
@@ -2316,11 +2323,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(8) .text-truncate",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(8) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[8]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
index 229715fd7..7ab010496 100644
--- a/backend/src/integration/resources/SHIBUI-1407-1.side
+++ b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -2313,11 +2313,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(8) .text-truncate",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(8) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[8]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
index 4c164c276..98b22bea0 100644
--- a/backend/src/integration/resources/SHIBUI-1674-1.side
+++ b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -348,9 +348,9 @@
       "id": "56f49fe8-340c-46fa-bda9-0b3c0de98bdb",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(5) .svg-inline--fa:nth-child(2)",
+      "target": "css=.row:nth-child(2) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(5) .svg-inline--fa:nth-child(2)", "css:finder"]
+        ["css=.row:nth-child(2) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-2267.side b/backend/src/integration/resources/SHIBUI-2267.side
index 3f27a1c35..6ba7bea24 100644
--- a/backend/src/integration/resources/SHIBUI-2267.side
+++ b/backend/src/integration/resources/SHIBUI-2267.side
@@ -254,11 +254,11 @@
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(4) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(4) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
@@ -357,11 +357,11 @@
       "id": "121a6247-05d6-4553-b565-ebee2552f7e9",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(4) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(4) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
diff --git a/backend/src/integration/resources/SHIBUI-2380.side b/backend/src/integration/resources/SHIBUI-2380.side
index c9c1c4ed2..a81cad5c3 100644
--- a/backend/src/integration/resources/SHIBUI-2380.side
+++ b/backend/src/integration/resources/SHIBUI-2380.side
@@ -659,19 +659,6 @@
         ["xpath=//span[contains(.,'8. Relying Party Overrides')]", "xpath:innerText"]
       ],
       "value": ""
-    }, {
-      "id": "881d4939-af1c-4557-8ee1-e08abf3a5402",
-      "comment": "",
-      "command": "type",
-      "target": "id=root_relyingPartyOverrides_disallowedFeatures",
-      "targets": [
-        ["id=root_relyingPartyOverrides_disallowedFeatures", "id"],
-        ["css=#root_relyingPartyOverrides_disallowedFeatures", "css:finder"],
-        ["xpath=//input[@id='root_relyingPartyOverrides_disallowedFeatures']", "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[5]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[5]/div/div/div/div/input", "xpath:position"]
-      ],
-      "value": "theseAreDisallowed"
     }, {
       "id": "da429ce2-0145-4c3d-a924-46d4549c6038",
       "comment": "",
@@ -1099,35 +1086,23 @@
       "id": "72f99f17-450a-4f9c-b791-3b6f7b61e76c",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(2) > .d-flex > .d-block:nth-child(2)",
-      "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(2) > .d-flex > .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[2]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[2]/div/span[2]", "xpath:position"],
-        ["xpath=//span[contains(.,'PT2H')]", "xpath:innerText"]
-      ],
-      "value": "PT2H"
-    }, {
-      "id": "e6087be5-881a-4637-aa84-540ce6c80b54",
-      "comment": "",
-      "command": "assertText",
       "target": "css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(2)",
       "targets": [
         ["css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
         ["xpath=//section[8]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"],
-        ["xpath=//span[contains(.,'theseAreDisallowed')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'PT2H')]", "xpath:innerText"]
       ],
-      "value": "theseAreDisallowed"
+      "value": "PT2H"
     }, {
       "id": "97624c53-1510-4bbb-b661-8a22539b1d86",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(13) .text-truncate",
+      "target": "css=div:nth-child(1) > div:nth-child(22) .text-truncate",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(13) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[13]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div[13]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(1) > div:nth-child(22) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[22]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div[22]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'postFlow')]", "xpath:innerText"]
       ],
       "value": "postFlow"
@@ -1135,11 +1110,11 @@
       "id": "336449c5-1e29-4534-8be3-96b334e044b6",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(18) .text-truncate",
+      "target": "css=div:nth-child(31) .text-truncate",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(18) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[18]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div[18]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(31) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[31]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[31]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'someRandomTokenType')]", "xpath:innerText"]
       ],
       "value": "someRandomTokenType"
@@ -1147,11 +1122,11 @@
       "id": "ab9a292a-358e-4f37-be17-969299b295c4",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(29) .text-truncate",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(4) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(29) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[29]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[29]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(4) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'9000')]", "xpath:innerText"]
       ],
       "value": "9000"
@@ -1159,11 +1134,11 @@
       "id": "9d62366b-bcb3-43bf-ba61-6e42ba5900e6",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(42) .text-truncate",
+      "target": "css=div:nth-child(35) .text-truncate",
       "targets": [
-        ["css=div:nth-child(42) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[42]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[42]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(35) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[35]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[35]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'PT6H')]", "xpath:innerText"]
       ],
       "value": "PT6H"