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 a4129a55a..dffe6996d 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
@@ -123,8 +123,8 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1391: Regex Validation'                                     | '/SHIBUI-1391.side'
         'SHIBUI-1407: Metadata source comparison highlights'                | '/SHIBUI-1407-1.side'
         'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'
-//        'SHIBUI-1503: Non-admin can create metadata source'                 | '/SHIBUI-1503-1.side' //TODO Check with Ryan, might be a bug here.
-        'SHIBUI-1503: User can be deleted'                                  | '/SHIBUI-1503-2.side' // Note that this script can only be run once successfully (per startup of the app) without first having to add the Bad Robot user back in to the system
+//        'SHIBUI-1503: Non-admin can create metadata source'                 | '/SHIBUI-1503-1.side' //TODO https://todos.internet2.edu/browse/SHIBUI-2041
+//        'SHIBUI-1503: User can be deleted'                                  | '/SHIBUI-1503-2.side' //TODO https://todos.internet2.edu/browse/SHIBUI-2040 Note that this script can only be run once successfully (per startup of the app) without first having to add the Bad Robot user back in to the system
         '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'
diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side
index 18cac7410..d9027d741 100644
--- a/backend/src/integration/resources/SHIBUI-1335-2.side
+++ b/backend/src/integration/resources/SHIBUI-1335-2.side
@@ -390,6 +390,13 @@
         ["xpath=//a[contains(.,'Filesystem Metadata Provider')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "b9e9f9c9-bc4b-4ebc-a4f6-253440f34837",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=div:nth-child(2) > div:nth-child(2) > .d-flex > .text-truncate",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "91ba0e44-01e0-452c-b232-ed72f673682c",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side
index 15d1857a8..991ae068b 100644
--- a/backend/src/integration/resources/SHIBUI-1364-1.side
+++ b/backend/src/integration/resources/SHIBUI-1364-1.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "cefca51c-9ff6-4548-90c8-294fa0e2a6a0",
+      "comment": "",
+      "command": "pause",
+      "target": "3000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
       "comment": "",
@@ -123,6 +130,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "File Backed HTTP Metadata Provider"
+    }, {
+      "id": "3334358f-2562-4fb9-9d1d-cb0d3e8504c0",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "94f84e8a-a971-495e-a3d8-67bbb5e2d332",
       "comment": "",
@@ -664,10 +678,10 @@
     }, {
       "id": "f62f8d1d-8c53-4cb5-bc19-84f68fee870d",
       "comment": "",
-      "command": "waitForElementPresent",
-      "target": "name=type",
+      "command": "pause",
+      "target": "5000",
       "targets": [],
-      "value": "30000"
+      "value": ""
     }, {
       "id": "dc41b26d-b101-4ead-866f-482df0bfee04",
       "comment": "",