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 6ad82a4ab..0c05a3d99 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
@@ -101,7 +101,7 @@ class SeleniumSIDETest extends Specification {
         // TODO: Uncomment the below commented tests once they've been updated to use the new configuration screen
         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 with filters'                            | '/SHIBUI-1364-2.side'
         'SHIBUI-1364: Compare LDMP with filters'                            | '/SHIBUI-1364-3.side'
         'SHIBUI-1364: Compare DHTTPMP with filters'                         | '/SHIBUI-1364-4.side'
@@ -126,7 +126,7 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'
         'SHIBUI-1503: Non-admin can create metadata source'                 | '/SHIBUI-1503-1.side'
         'SHIBUI-1503: User can be deleted'                                  | '/SHIBUI-1503-2.side'
-        'SHIBUI-1503: User can be enabled'                                  | '/SHIBUI-1503-3.side'
+        'SHIBUI-1503: User can be enabled'                                  | '/SHIBUI-1503-3.side'*/
         'SHIBUI-1740: Group can be created, edited, deleted'                | '/SHIBUI-1740-1.side'
         'SHIBUI-1740: Verify dev profile group membership'                  | '/SHIBUI-1740-2.side'
         'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
diff --git a/backend/src/integration/resources/SHIBUI-1740-1.side b/backend/src/integration/resources/SHIBUI-1740-1.side
index 7f8da0582..40a5e54df 100644
--- a/backend/src/integration/resources/SHIBUI-1740-1.side
+++ b/backend/src/integration/resources/SHIBUI-1740-1.side
@@ -137,6 +137,13 @@
         ["css=.fa-save", "css:finder"]
       ],
       "value": ""
+    }, {
+      "id": "e3684ceb-a44e-47f8-bb52-c745d8188e9e",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "xpath=//td[contains(.,'Test Group')]",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "331aeb76-c245-4a12-a3e9-dfca504b3ca6",
       "comment": "",
@@ -170,6 +177,13 @@
         ["css=tr:nth-child(6) .text-primary path", "css:finder"]
       ],
       "value": ""
+    }, {
+      "id": "c75ac961-05b0-4cf9-9436-5ec38ed1b410",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_name",
+      "targets": [],
+      "value": ""
     }, {
       "id": "d4711afb-8e77-48fa-827d-db0098bd9601",
       "comment": "",
@@ -183,6 +197,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Edited Test Group"
+    }, {
+      "id": "dec991dd-5efc-436b-a5ec-f63c9f80e8ad",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_description",
+      "targets": [],
+      "value": ""
     }, {
       "id": "93ff4a1e-5895-4533-ab5e-b1455266cd14",
       "comment": "",
@@ -209,6 +230,13 @@
         ["xpath=//button[contains(.,' Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "00c5a40f-006a-41a4-a931-e7c6b563d8fb",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "xpath=//td[contains(.,'Edited Test Group')]",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "40ccad28-e2e1-48ac-8aa5-cf0d90a7e6ac",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1740-2.side b/backend/src/integration/resources/SHIBUI-1740-2.side
index 123b89337..abe7b0709 100644
--- a/backend/src/integration/resources/SHIBUI-1740-2.side
+++ b/backend/src/integration/resources/SHIBUI-1740-2.side
@@ -169,6 +169,13 @@
         ["xpath=//a[contains(.,'Admin')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "46c49fae-b4f5-45fd-a925-5892d1d6295f",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=role-admin",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "c8600f21-db2e-442a-89bf-7c7d003d5e41",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1740-3.side b/backend/src/integration/resources/SHIBUI-1740-3.side
index 47bd159fe..2a026c9b1 100644
--- a/backend/src/integration/resources/SHIBUI-1740-3.side
+++ b/backend/src/integration/resources/SHIBUI-1740-3.side
@@ -53,7 +53,7 @@
       ],
       "value": "${KEY_ENTER}"
     }, {
-      "id": "2b5fd1e0-6987-4663-9b28-d8551ae5a161",
+      "id": "b64a0533-2175-4578-baeb-7ca4e97e0e23",
       "comment": "",
       "command": "open",
       "target": "/api/heheheheheheheWipeout",
@@ -70,7 +70,7 @@
       "id": "cafc23ea-1ffa-4708-9d14-9771031699a6",
       "comment": "",
       "command": "open",
-      "target": "/dashboard",
+      "target": "/",
       "targets": [],
       "value": ""
     }, {
@@ -100,6 +100,13 @@
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "e981fc0b-47e9-4360-a457-704e25babb84",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=root_serviceProviderName",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b34f2194-a1bd-48a5-9f75-b8936ba6082a",
       "comment": "",
@@ -112,7 +119,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/div/form/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//input", "xpath:position"]
       ],
-      "value": "Selenium Test2"
+      "value": "Selenium Test"
     }, {
       "id": "6d4f04c3-c45c-4eed-b744-ba847c9af1f9",
       "comment": "",
@@ -125,7 +132,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/div/form/div/div/div/div/div/div[2]/div/div/input", "xpath:idRelative"],
         ["xpath=//div[2]/div/div/input", "xpath:position"]
       ],
-      "value": "test2"
+      "value": "test"
     }, {
       "id": "edb46777-bbd0-4e59-8859-093af94477f1",
       "comment": "",
@@ -246,6 +253,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "94c6632a-eea4-4dcf-bbf2-8347879bd248",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "linkText=Selenium Test",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "fbf5739f-bc42-44c6-9b04-4b3e8d195718",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1740-4.side b/backend/src/integration/resources/SHIBUI-1740-4.side
index 4e83c822f..2bdd98022 100644
--- a/backend/src/integration/resources/SHIBUI-1740-4.side
+++ b/backend/src/integration/resources/SHIBUI-1740-4.side
@@ -81,6 +81,13 @@
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "545dab13-5336-445b-ad72-88caf5c7972a",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "id=root_serviceProviderName",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "df2df867-aa22-4c76-8006-c2decea70eb5",
       "comment": "",
@@ -226,6 +233,13 @@
         ["xpath=//li[3]/button/span[2]", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "17150592-3f1e-44d2-96eb-c170083c50c1",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=Selenium Test",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "fa8f0af2-5777-4e1f-bf2f-52911c900a2b",
       "comment": "",
@@ -295,6 +309,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "f224e859-0e06-45d9-996e-969592d60407",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=Selenium Test",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "3a33f990-3c63-4446-b4e3-2694ea13a5da",
       "comment": "",