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 8ac62e077..29d03624b 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
@@ -104,7 +104,7 @@ class SeleniumSIDETest extends Specification {
         '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'
-/*        'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
+        'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
         'SHIBUI-1311: Metadata Provider Dashboard'                          | '/SHIBUI-1311.side'
         'SHIBUI-950: Metadata Source from XML w/ digest'                    | '/SHIBUI-950.side'
         'SHIBUI-1352: Create LocalDynamic provider'                         | '/SHIBUI-1352-1.side'
@@ -112,7 +112,7 @@ class SeleniumSIDETest extends Specification {
         '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-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
+/*        'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
         'SHIBUI-1335: Verify Filesystem Metadata Provider Filters'          | '/SHIBUI-1335-2.side' // adding filters to this resolver type was removed in the react update
         'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters'       | '/SHIBUI-1335-3.side' // adding filters to this resolver type was removed in the react update
         'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters'        | '/SHIBUI-1335-4.side'
diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
index 52695c6bc..2f5ff3c4d 100644
--- a/backend/src/integration/resources/SHIBUI-1281.side
+++ b/backend/src/integration/resources/SHIBUI-1281.side
@@ -74,10 +74,12 @@
       "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,14 +88,16 @@
       "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary:nth-child(1)", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
@@ -779,8 +783,17 @@
       "id": "3cfbc4e0-f120-43ca-8a59-8727f91b5a1c",
       "comment": "",
       "command": "click",
-      "target": "css=body",
-      "targets": [],
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
       "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
@@ -1864,12 +1877,17 @@
       ],
       "value": ""
     }, {
-      "id": "553dd570-b1bb-43bb-a469-63ee08a09794",
+      "id": "12485e9f-5ab1-4c9c-a948-d6d13386b97f",
       "comment": "",
       "command": "click",
-      "target": "css=.fa-check",
+      "target": "id=attributeRelease.checkAll",
       "targets": [
-        ["css=.fa-check", "css:finder"]
+        ["id=attributeRelease.checkAll", "id"],
+        ["css=#attributeRelease\\.checkAll", "css:finder"],
+        ["xpath=//button[@id='attributeRelease.checkAll']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[10]/div/div/fieldset/table/tbody/tr[13]/td[2]/button", "xpath:idRelative"],
+        ["xpath=//td[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Check All Attributes')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
@@ -1882,19 +1900,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_serviceEnabled",
-      "targets": [
-        ["id=root_serviceEnabled", "id"],
-        ["css=#root_serviceEnabled", "css:finder"],
-        ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
index cd9808a7c..ebdee6f30 100644
--- a/backend/src/integration/resources/SHIBUI-1311.side
+++ b/backend/src/integration/resources/SHIBUI-1311.side
@@ -74,10 +74,12 @@
       "id": "e7a98419-36c7-4b0f-a99d-087144f6a417",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,12 +88,14 @@
       "id": "74fef022-3979-4bed-9226-b25114514976",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -136,6 +140,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test Metadata Provider"
+    }, {
+      "id": "e907f2a4-db3f-42da-af79-1ccaf6032b9c",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "add874d5-e3b2-4412-8039-2b9d2619ed19",
       "comment": "",
@@ -590,19 +601,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "79b96f40-2677-438a-9564-62df0ea2c116",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_enabled",
-      "targets": [
-        ["id=root_enabled", "id"],
-        ["css=#root_enabled", "css:finder"],
-        ["xpath=//input[@id='root_enabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "52f5680c-c63d-411e-8332-52901f12ea3b",
       "comment": "",
@@ -681,10 +679,12 @@
       "id": "211711a2-0af5-4f5e-a427-812c2de0264d",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -693,12 +693,14 @@
       "id": "ed69adec-1265-4796-96a9-06ed5930d952",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -965,8 +967,13 @@
       "id": "1675c12e-8951-4d07-87b1-15e280699d66",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(2) .badge",
-      "targets": [],
+      "target": "css=tr:nth-child(2) > .align-middle:nth-child(2)",
+      "targets": [
+        ["css=tr:nth-child(2) > .align-middle:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr[2]/td[2]", "xpath:idRelative"],
+        ["xpath=//tr[2]/td[2]", "xpath:position"],
+        ["xpath=//td[contains(.,'Test Provider 2')]", "xpath:innerText"]
+      ],
       "value": "10000"
     }, {
       "id": "b437068f-d3ed-43b5-9975-fb54decaf7ab",
@@ -996,6 +1003,24 @@
         ["xpath=//a[contains(.,'Test Provider 2')]", "xpath:innerText"]
       ],
       "value": "Test Provider 2"
+    }, {
+      "id": "06dce737-90a1-4c29-ba5e-16dc9ce2b161",
+      "comment": "",
+      "command": "click",
+      "target": "xpath=//table/tbody/tr[2]/td[6]/span/div/input",
+      "targets": [
+        ["css=tr:nth-child(1) .custom-control", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div", "xpath:idRelative"],
+        ["xpath=//span/div", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "56ddb945-e04d-4bf8-84d3-5157e96853f3",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "xpath=//li[contains(.,'Metadata provider has been enabled.')]",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b799fede-c85b-4bd3-8e03-347f8a7d188a",
       "comment": "",
@@ -1006,18 +1031,25 @@
         ["xpath=//tr[2]/td/div/button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "dc866249-3245-4baa-af0e-55af28d270cf",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "72123a28-c3be-478c-8f30-555e346837e2",
       "comment": "",
-      "command": "assertText",
-      "target": "css=tr:nth-child(2) > .text-right",
+      "command": "assertChecked",
+      "target": "xpath=//table/tbody/tr[1]/td[6]/span/div/input",
       "targets": [
         ["css=tr:nth-child(2) > .text-right", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr[2]/td[6]", "xpath:idRelative"],
         ["xpath=//tr[2]/td[6]", "xpath:position"],
         ["xpath=//td[contains(.,'Enabled')]", "xpath:innerText"]
       ],
-      "value": "Enabled"
+      "value": ""
     }, {
       "id": "664aafa3-9f6f-4eab-9eb6-a4d1a8344c5c",
       "comment": "",
@@ -1031,15 +1063,15 @@
     }, {
       "id": "ad8842de-2a4c-42a4-b919-dd7524a679c6",
       "comment": "",
-      "command": "assertText",
-      "target": "css=tr:nth-child(2) > .text-right",
+      "command": "assertNotChecked",
+      "target": "xpath=//table/tbody/tr[1]/td[6]/span/div/input",
       "targets": [
         ["css=tr:nth-child(2) > .text-right", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr[2]/td[6]", "xpath:idRelative"],
         ["xpath=//tr[2]/td[6]", "xpath:position"],
         ["xpath=//td[contains(.,'Disabled')]", "xpath:innerText"]
       ],
-      "value": "Disabled"
+      "value": ""
     }, {
       "id": "57d0e204-6c28-4be5-9888-28f8d7738508",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
index ba8dab567..de947f664 100644
--- a/backend/src/integration/resources/SHIBUI-1333.side
+++ b/backend/src/integration/resources/SHIBUI-1333.side
@@ -74,10 +74,12 @@
       "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,14 +88,16 @@
       "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary:nth-child(1)", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
@@ -1899,19 +1903,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_serviceEnabled",
-      "targets": [
-        ["id=root_serviceEnabled", "id"],
-        ["css=#root_serviceEnabled", "css:finder"],
-        ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
@@ -2166,10 +2157,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(2) > div:nth-child(4) > .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(2) > div:nth-child(4) > .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[4]/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-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index 9476b6d3f..1a773bd8e 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -74,10 +74,12 @@
       "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,14 +88,16 @@
       "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary:nth-child(1)", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
@@ -1909,19 +1913,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_serviceEnabled",
-      "targets": [
-        ["id=root_serviceEnabled", "id"],
-        ["css=#root_serviceEnabled", "css:finder"],
-        ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
@@ -2166,10 +2157,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(2) > div:nth-child(4) > .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(2) > div:nth-child(4) > .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[4]/div[2]/div[3]/span", "xpath:idRelative"],
         ["xpath=//div[3]/span", "xpath:position"],
         ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"]
       ],
@@ -2523,6 +2514,13 @@
         ["xpath=//translate-i18n[contains(.,'Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "7cb06481-49e0-41a5-b45c-e75c15fda227",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "f2e3d420-5cf5-4165-94da-41688839cf82",
       "comment": "",
@@ -2539,20 +2537,51 @@
       "id": "d1389dc8-86b0-44df-a39e-0037bc695403",
       "comment": "",
       "command": "click",
+      "target": "linkText=Service Provider v2",
+      "targets": [
+        ["linkText=Service Provider v2", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'Service Provider v2')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/7060569d-8281-4418-ad56-900b8b608ece/configuration/options')]", "xpath:href"],
+        ["xpath=//td/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Service Provider v2')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "68972f7d-8268-4701-865c-585a39987208",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Version History",
+      "targets": [
+        ["linkText=Version History", "linkText"],
+        ["css=#navigation .btn-link", "css:finder"],
+        ["xpath=//div[@id='navigation']/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/7060569d-8281-4418-ad56-900b8b608ece/configuration/history')]", "xpath:href"],
+        ["xpath=//section/div/div/div[2]/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,' Version History')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "481d1b54-95d4-4e82-8bd3-eb236a68a624",
+      "comment": "",
+      "command": "click",
       "target": "css=tr:nth-child(1) .custom-control-label",
       "targets": [
         ["css=tr:nth-child(1) .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/table/tbody/tr/td/div/label", "xpath:idRelative"],
         ["xpath=//label", "xpath:position"],
         ["xpath=//label[contains(.,'Check to select')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "68972f7d-8268-4701-865c-585a39987208",
+      "id": "3ee7f2c3-8b40-48c5-a7b0-a1ea1ec36159",
       "comment": "",
       "command": "click",
-      "target": "css=tr:nth-child(3) .custom-control-label",
+      "target": "css=tr:nth-child(2) .custom-control-label",
       "targets": [
         ["css=tr:nth-child(2) .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/table/tbody/tr[2]/td/div/label", "xpath:idRelative"],
         ["xpath=//tr[2]/td/div/label", "xpath:position"]
       ],
       "value": ""
diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side
index 0887f60e5..6902eab35 100644
--- a/backend/src/integration/resources/SHIBUI-1334-2.side
+++ b/backend/src/integration/resources/SHIBUI-1334-2.side
@@ -74,10 +74,12 @@
       "id": "e7a98419-36c7-4b0f-a99d-087144f6a417",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,12 +88,14 @@
       "id": "74fef022-3979-4bed-9226-b25114514976",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -123,6 +127,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test Metadata Provider"
+    }, {
+      "id": "fe45d26e-5005-4218-b4e8-10776a2384e9",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "add874d5-e3b2-4412-8039-2b9d2619ed19",
       "comment": "",
@@ -573,19 +584,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "79b96f40-2677-438a-9564-62df0ea2c116",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_enabled",
-      "targets": [
-        ["id=root_enabled", "id"],
-        ["css=#root_enabled", "css:finder"],
-        ["xpath=//input[@id='root_enabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "52f5680c-c63d-411e-8332-52901f12ea3b",
       "comment": "",
@@ -828,11 +826,11 @@
       "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)",
+      "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[4]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "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(.,'123 version 2')]", "xpath:innerText"]
       ],
       "value": "10000"
@@ -840,10 +838,11 @@
       "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)",
+      "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)",
       "targets": [
-        ["css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//primitive-property[4]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "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(.,'123 version 2')]", "xpath:innerText"]
       ],
       "value": "123 version 2"
@@ -851,33 +850,34 @@
       "id": "a13198b9-7827-47e2-ade3-143b981d34ee",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)",
+      "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)",
       "targets": [
-        ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"],
-        ["xpath=//div[4]/div/span[3]", "xpath:position"]
+        ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"],
+        ["xpath=//div[3]/div/span[3]", "xpath:position"]
       ],
       "value": "123"
     }, {
       "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)",
+      "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[12]/div/span[2]", "xpath:position"]
+        ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[11]/div/span[2]", "xpath:position"]
       ],
       "value": "false"
     }, {
       "id": "190cc157-d427-4046-aff2-180392395ad3",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)",
+      "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)",
       "targets": [
-        ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"],
-        ["xpath=//div[12]/div/span[3]", "xpath:position"]
+        ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"],
+        ["xpath=//div[11]/div/span[3]", "xpath:position"],
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side
index 0bdb93ee6..a5b661335 100644
--- a/backend/src/integration/resources/SHIBUI-1352-1.side
+++ b/backend/src/integration/resources/SHIBUI-1352-1.side
@@ -74,10 +74,12 @@
       "id": "8ff3019f-42b4-4ba8-8b63-b9f0f6aa413f",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,12 +88,14 @@
       "id": "c36d95be-7a13-454d-a05e-ef323b530c9d",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -123,6 +127,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test Local Dynamic Provider"
+    }, {
+      "id": "419d075c-3257-41aa-b462-25296a5e4b25",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "fd4257d7-488a-4eed-8d72-7f39034a1c72",
       "comment": "",
@@ -234,13 +245,6 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "0.5"
-    }, {
-      "id": "007c8b1a-41ee-4498-9e90-ac9d1d50c10c",
-      "comment": "",
-      "command": "sendKeys",
-      "target": "id=root_dynamicMetadataResolverAttributes_refreshDelayFactor",
-      "targets": [],
-      "value": "${KEY_ENTER}"
     }, {
       "id": "b0ba61cf-ebb5-41f7-b512-63ca2cd0e478",
       "comment": "",
@@ -432,19 +436,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "f4b19f08-bf68-47d0-9c1d-d59f6476a468",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_enabled",
-      "targets": [
-        ["id=root_enabled", "id"],
-        ["css=#root_enabled", "css:finder"],
-        ["xpath=//input[@id='root_enabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "e27e05ac-3a23-47e2-b5b4-51b2ae2f4b31",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side
index 70c1c633a..6ec4ac969 100644
--- a/backend/src/integration/resources/SHIBUI-1352-2.side
+++ b/backend/src/integration/resources/SHIBUI-1352-2.side
@@ -74,10 +74,12 @@
       "id": "1245c352-1466-4b3f-ac54-a71bdd99ed29",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,12 +88,14 @@
       "id": "0a94c3ad-96c3-464c-8db2-04b8d40d07fe",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -123,6 +127,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test File System Provider"
+    }, {
+      "id": "857164d1-abcf-4b8c-a565-ee015ac17938",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "9621e646-308a-4eda-9244-036e8997467a",
       "comment": "",
@@ -348,19 +359,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "6a929cbb-551e-416d-9dd0-aea3d2ff7fa8",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_enabled",
-      "targets": [
-        ["id=root_enabled", "id"],
-        ["css=#root_enabled", "css:finder"],
-        ["xpath=//input[@id='root_enabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "745769b0-8422-4100-8ce5-5ec1b1a18c25",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-950.side b/backend/src/integration/resources/SHIBUI-950.side
index c101d3cd6..0862db2f2 100644
--- a/backend/src/integration/resources/SHIBUI-950.side
+++ b/backend/src/integration/resources/SHIBUI-950.side
@@ -74,10 +74,12 @@
       "id": "694012a7-3480-4af9-9dbc-2879ffd4d8b1",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,14 +88,16 @@
       "id": "d000a81f-a776-44f6-80c4-dfb5ec892dc0",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary:nth-child(1)", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
@@ -101,8 +105,14 @@
       "id": "2a074ac0-d142-4124-83c1-792d5e744605",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=.resolver-nav-option:nth-child(1) > .btn",
-      "targets": [],
+      "target": "id=root_serviceProviderName",
+      "targets": [
+        ["id=root_serviceProviderName", "id"],
+        ["css=#root_serviceProviderName", "css:finder"],
+        ["xpath=//input[@id='root_serviceProviderName']", "xpath:attributes"],
+        ["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": "30000"
     }, {
       "id": "1e8aba21-e7f4-45ef-b004-4aedcf2ab74e",