diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side
index c1f2d9405..0a0891cdf 100644
--- a/backend/src/integration/resources/SHIBUI-1335-4.side
+++ b/backend/src/integration/resources/SHIBUI-1335-4.side
@@ -93,7 +93,7 @@
         ["xpath=//input[@id='/name']", "xpath:attributes"],
         ["xpath=//input", "xpath:position"]
       ],
-      "value": "Local Dynamic Metadata Provider"
+      "value": "Dynamic Http Metadata Provider"
     }, {
       "id": "aac150b1-6140-476b-8bdb-ebb83a14812d",
       "comment": "",
@@ -106,7 +106,7 @@
         ["xpath=//select[@id='/type']", "xpath:attributes"],
         ["xpath=//select", "xpath:position"]
       ],
-      "value": "label=LocalDynamicMetadataProvider"
+      "value": "label=DynamicHttpMetadataProvider"
     }, {
       "id": "7a60cb3c-ed3c-495c-8329-2fe52e72cceb",
       "comment": "",
@@ -138,20 +138,77 @@
       ],
       "value": "12345"
     }, {
-      "id": "e2e3a3e4-196c-483d-ac52-de4027636a05",
+      "id": "d8716eae-bb36-42ae-b505-2626c5a8c377",
+      "comment": "",
+      "command": "select",
+      "target": "id=/metadataRequestURLConstructionScheme/type",
+      "targets": [],
+      "value": "label=MetadataQueryProtocol"
+    }, {
+      "id": "326f3387-12c8-4294-843c-182fd8d06c46",
+      "comment": "",
+      "command": "click",
+      "target": "css=option:nth-child(2)",
+      "targets": [
+        ["css=option:nth-child(2)", "css:finder"],
+        ["xpath=//option[@value='1: MetadataQueryProtocol']", "xpath:attributes"],
+        ["xpath=//select[@id='/metadataRequestURLConstructionScheme/type']/option[2]", "xpath:idRelative"],
+        ["xpath=//option[2]", "xpath:position"],
+        ["xpath=//option[contains(.,'MetadataQueryProtocol')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "516d7e81-3672-4dd7-811b-70ee38c21e52",
+      "comment": "",
+      "command": "click",
+      "target": "id=/metadataRequestURLConstructionScheme/content",
+      "targets": [
+        ["id=/metadataRequestURLConstructionScheme/content", "id"],
+        ["name=field10", "name"],
+        ["css=#\\/metadataRequestURLConstructionScheme\\/content", "css:finder"],
+        ["xpath=//input[@id='/metadataRequestURLConstructionScheme/content']", "xpath:attributes"],
+        ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "7b60ce4c-a16c-4bc5-9d9c-999f9fc6b197",
       "comment": "",
       "command": "type",
-      "target": "id=/sourceDirectory",
+      "target": "id=/metadataRequestURLConstructionScheme/content",
       "targets": [
-        ["id=/sourceDirectory", "id"],
-        ["name=field8", "name"],
-        ["css=#\\/sourceDirectory", "css:finder"],
-        ["xpath=//input[@id='/sourceDirectory']", "xpath:attributes"],
+        ["id=/metadataRequestURLConstructionScheme/content", "id"],
+        ["name=field10", "name"],
+        ["css=#\\/metadataRequestURLConstructionScheme\\/content", "css:finder"],
+        ["xpath=//input[@id='/metadataRequestURLConstructionScheme/content']", "xpath:attributes"],
         ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"]
       ],
-      "value": "%{idp.home}/foo"
+      "value": "randomString"
+    }, {
+      "id": "cd0d4f15-2193-4814-8e72-f38d9d2221e2",
+      "comment": "",
+      "command": "click",
+      "target": "id=/requireValidMetadata.false",
+      "targets": [
+        ["id=/requireValidMetadata.false", "id"],
+        ["css=#\\/requireValidMetadata\\.false", "css:finder"],
+        ["xpath=//input[@id='/requireValidMetadata.false']", "xpath:attributes"],
+        ["xpath=//div[2]/label/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "3b83fa2b-147f-4b7b-9b30-44c28b07576e",
+      "comment": "",
+      "command": "click",
+      "target": "id=/failFastInitialization.false",
+      "targets": [
+        ["id=/failFastInitialization.false", "id"],
+        ["css=#\\/failFastInitialization\\.false", "css:finder"],
+        ["xpath=//input[@id='/failFastInitialization.false']", "xpath:attributes"],
+        ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
+      ],
+      "value": ""
     }, {
-      "id": "5f32dd3f-a1d0-4ca3-9f2d-8a9cc6141004",
+      "id": "175324e0-025d-4674-a3ee-51307a215079",
       "comment": "",
       "command": "click",
       "target": "css=.next",
@@ -161,20 +218,33 @@
       ],
       "value": ""
     }, {
-      "id": "0586f02c-c210-4e44-9a86-3e914bc94f3b",
+      "id": "30565900-4c02-4cb0-9d5a-c980349307ea",
+      "comment": "",
+      "command": "click",
+      "target": "id=/dynamicMetadataResolverAttributes/refreshDelayFactor",
+      "targets": [
+        ["id=/dynamicMetadataResolverAttributes/refreshDelayFactor", "id"],
+        ["name=field15", "name"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/refreshDelayFactor", "css:finder"],
+        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/refreshDelayFactor']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "5b6ea5bf-d5c1-4d5e-bc15-ffabf67f74ec",
       "comment": "",
       "command": "type",
       "target": "id=/dynamicMetadataResolverAttributes/refreshDelayFactor",
       "targets": [
         ["id=/dynamicMetadataResolverAttributes/refreshDelayFactor", "id"],
-        ["name=field11", "name"],
+        ["name=field15", "name"],
         ["css=#\\/dynamicMetadataResolverAttributes\\/refreshDelayFactor", "css:finder"],
         ["xpath=//input[@id='/dynamicMetadataResolverAttributes/refreshDelayFactor']", "xpath:attributes"],
         ["xpath=//input", "xpath:position"]
       ],
       "value": "0.5"
     }, {
-      "id": "1a8a9dcf-9c6b-4802-8483-981d14131346",
+      "id": "a51172e3-792f-4881-8083-efcb34c63e56",
       "comment": "",
       "command": "click",
       "target": "css=#\\/dynamicMetadataResolverAttributes\\/minCacheDuration-container .btn",
@@ -187,21 +257,28 @@
       ],
       "value": ""
     }, {
-      "id": "443a9cfc-17c8-49da-9d87-bfabda8fd0b6",
+      "id": "b1ec3405-0d75-45d6-8986-51c2f09c4dc4",
       "comment": "",
       "command": "click",
-      "target": "id=/dynamicMetadataResolverAttributes/minCacheDuration__option--0",
+      "target": "id=/dynamicMetadataResolverAttributes/minCacheDuration__option--1",
       "targets": [
-        ["id=/dynamicMetadataResolverAttributes/minCacheDuration__option--0", "id"],
-        ["css=#\\/dynamicMetadataResolverAttributes\\/minCacheDuration__option--0", "css:finder"],
-        ["xpath=//li[@id='/dynamicMetadataResolverAttributes/minCacheDuration__option--0']", "xpath:attributes"],
-        ["xpath=//ul[@id='/dynamicMetadataResolverAttributes/minCacheDuration__listbox']/li", "xpath:idRelative"],
-        ["xpath=//auto-complete/div/ul/li", "xpath:position"],
-        ["xpath=//li[contains(.,'PT0S')]", "xpath:innerText"]
+        ["id=/dynamicMetadataResolverAttributes/minCacheDuration__option--1", "id"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/minCacheDuration__option--1", "css:finder"],
+        ["xpath=//li[@id='/dynamicMetadataResolverAttributes/minCacheDuration__option--1']", "xpath:attributes"],
+        ["xpath=//ul[@id='/dynamicMetadataResolverAttributes/minCacheDuration__listbox']/li[2]", "xpath:idRelative"],
+        ["xpath=//auto-complete/div/ul/li[2]", "xpath:position"],
+        ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "84f35d35-ea9c-4a06-aaec-bee1c1922aec",
+      "id": "203f95b2-a2f8-4d7c-88a9-7934a9ce8c23",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn",
+      "targets": [],
+      "value": "10000"
+    }, {
+      "id": "2793bf1b-177b-461f-b06c-0a584ab6eaf0",
       "comment": "",
       "command": "click",
       "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn",
@@ -213,27 +290,20 @@
       ],
       "value": ""
     }, {
-      "id": "c03be15d-ee34-4cd1-bac9-c52e3baa70a3",
+      "id": "87084a6a-8e89-4c00-a3d9-c104107a3ba2",
       "comment": "",
       "command": "click",
-      "target": "id=/dynamicMetadataResolverAttributes/maxCacheDuration__option--2",
+      "target": "id=/dynamicMetadataResolverAttributes/maxCacheDuration__option--3",
       "targets": [
-        ["id=/dynamicMetadataResolverAttributes/maxCacheDuration__option--2", "id"],
-        ["css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration__option--2", "css:finder"],
-        ["xpath=//li[@id='/dynamicMetadataResolverAttributes/maxCacheDuration__option--2']", "xpath:attributes"],
-        ["xpath=//ul[@id='/dynamicMetadataResolverAttributes/maxCacheDuration__listbox']/li[3]", "xpath:idRelative"],
-        ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[3]", "xpath:position"]
+        ["id=/dynamicMetadataResolverAttributes/maxCacheDuration__option--3", "id"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration__option--3", "css:finder"],
+        ["xpath=//li[@id='/dynamicMetadataResolverAttributes/maxCacheDuration__option--3']", "xpath:attributes"],
+        ["xpath=//ul[@id='/dynamicMetadataResolverAttributes/maxCacheDuration__listbox']/li[4]", "xpath:idRelative"],
+        ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[4]", "xpath:position"]
       ],
       "value": ""
     }, {
-      "id": "c66f68b6-324d-4b74-bccf-5c032729c802",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxIdleEntityData-container .btn",
-      "targets": [],
-      "value": "10000"
-    }, {
-      "id": "f0cdfbcf-46e2-4013-b085-0730b0127842",
+      "id": "4c017bde-e242-4d2f-838e-a2a026e4292b",
       "comment": "",
       "command": "click",
       "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxIdleEntityData-container .btn",
@@ -245,39 +315,20 @@
       ],
       "value": ""
     }, {
-      "id": "56f964c0-7940-4cad-8314-193fe1ef0c1c",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "id=/dynamicMetadataResolverAttributes/maxIdleEntityData__option--1",
-      "targets": [],
-      "value": "10000"
-    }, {
-      "id": "dd663319-7eef-4301-a0d4-24d9583eab7f",
-      "comment": "",
-      "command": "click",
-      "target": "id=/dynamicMetadataResolverAttributes/maxIdleEntityData__option--1",
-      "targets": [
-        ["id=/dynamicMetadataResolverAttributes/maxIdleEntityData__option--1", "id"],
-        ["css=#\\/dynamicMetadataResolverAttributes\\/maxIdleEntityData__option--1", "css:finder"],
-        ["xpath=//li[@id='/dynamicMetadataResolverAttributes/maxIdleEntityData__option--1']", "xpath:attributes"],
-        ["xpath=//ul[@id='/dynamicMetadataResolverAttributes/maxIdleEntityData__listbox']/li[2]", "xpath:idRelative"],
-        ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[2]", "xpath:position"]
-      ],
-      "value": ""
-    }, {
-      "id": "25ed1d75-be93-4e20-88ba-57d8ae7bf053",
+      "id": "d477fd6a-2c15-4fb6-a199-d49aa495ef94",
       "comment": "",
       "command": "click",
-      "target": "id=/dynamicMetadataResolverAttributes/removeIdleEntityData.false",
+      "target": "id=/dynamicMetadataResolverAttributes/maxIdleEntityData__option--2",
       "targets": [
-        ["id=/dynamicMetadataResolverAttributes/removeIdleEntityData.false", "id"],
-        ["css=#\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData\\.false", "css:finder"],
-        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/removeIdleEntityData.false']", "xpath:attributes"],
-        ["xpath=//div[2]/label/input", "xpath:position"]
+        ["id=/dynamicMetadataResolverAttributes/maxIdleEntityData__option--2", "id"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/maxIdleEntityData__option--2", "css:finder"],
+        ["xpath=//li[@id='/dynamicMetadataResolverAttributes/maxIdleEntityData__option--2']", "xpath:attributes"],
+        ["xpath=//ul[@id='/dynamicMetadataResolverAttributes/maxIdleEntityData__listbox']/li[3]", "xpath:idRelative"],
+        ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[3]", "xpath:position"]
       ],
       "value": ""
     }, {
-      "id": "54df6d88-1a85-407f-935a-a016f5952a93",
+      "id": "62f7ce3c-5cff-43c6-8ce6-a0e6bf2b2257",
       "comment": "",
       "command": "click",
       "target": "css=#\\/dynamicMetadataResolverAttributes\\/cleanupTaskInterval-container .btn",
@@ -289,7 +340,7 @@
       ],
       "value": ""
     }, {
-      "id": "e7f2439a-e9a1-4b23-b0b9-d992f5b477d4",
+      "id": "bf855df4-326e-484e-9022-d2c84e09e6f3",
       "comment": "",
       "command": "click",
       "target": "id=/dynamicMetadataResolverAttributes/cleanupTaskInterval__option--3",
@@ -302,7 +353,163 @@
       ],
       "value": ""
     }, {
-      "id": "64af203b-565c-4e35-b7da-4646423a3279",
+      "id": "df2a3e70-d7d3-487b-a205-218e9987b060",
+      "comment": "",
+      "command": "click",
+      "target": "id=/dynamicMetadataResolverAttributes/persistentCacheManagerDirectory",
+      "targets": [
+        ["id=/dynamicMetadataResolverAttributes/persistentCacheManagerDirectory", "id"],
+        ["name=field21", "name"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/persistentCacheManagerDirectory", "css:finder"],
+        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/persistentCacheManagerDirectory']", "xpath:attributes"],
+        ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "b25d9d91-b8f2-46ad-ac79-cbac34fa3f91",
+      "comment": "",
+      "command": "type",
+      "target": "id=/dynamicMetadataResolverAttributes/persistentCacheManagerDirectory",
+      "targets": [
+        ["id=/dynamicMetadataResolverAttributes/persistentCacheManagerDirectory", "id"],
+        ["name=field21", "name"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/persistentCacheManagerDirectory", "css:finder"],
+        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/persistentCacheManagerDirectory']", "xpath:attributes"],
+        ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"]
+      ],
+      "value": "%{idp.home}/cache"
+    }, {
+      "id": "5b546b6b-ee98-4852-8ffd-b95f7e68d954",
+      "comment": "",
+      "command": "click",
+      "target": "id=/dynamicMetadataResolverAttributes/initializeFromPersistentCacheInBackground.false",
+      "targets": [
+        ["id=/dynamicMetadataResolverAttributes/initializeFromPersistentCacheInBackground.false", "id"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/initializeFromPersistentCacheInBackground\\.false", "css:finder"],
+        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/initializeFromPersistentCacheInBackground.false']", "xpath:attributes"],
+        ["xpath=//div[8]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "5743cab2-018a-4706-b052-0d26c8e1e963",
+      "comment": "",
+      "command": "click",
+      "target": "css=.label:nth-child(1)",
+      "targets": [
+        ["css=.label:nth-child(1)", "css:finder"],
+        ["xpath=//li[3]/button/span", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "b777b343-71a0-4056-a85e-d8d548b993b2",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-outline-secondary",
+      "targets": [
+        ["css=.btn-outline-secondary", "css:finder"],
+        ["xpath=(//button[@type='button'])[2]", "xpath:attributes"],
+        ["xpath=//div[@id='/metadataFilters/RequiredValidUntil/maxValidityInterval-container']/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "22f7bf37-718c-4126-867b-67a383eefff5",
+      "comment": "",
+      "command": "click",
+      "target": "id=/metadataFilters/RequiredValidUntil/maxValidityInterval__option--2",
+      "targets": [
+        ["id=/metadataFilters/RequiredValidUntil/maxValidityInterval__option--2", "id"],
+        ["css=#\\/metadataFilters\\/RequiredValidUntil\\/maxValidityInterval__option--2", "css:finder"],
+        ["xpath=//li[@id='/metadataFilters/RequiredValidUntil/maxValidityInterval__option--2']", "xpath:attributes"],
+        ["xpath=//ul[@id='/metadataFilters/RequiredValidUntil/maxValidityInterval__listbox']/li[3]", "xpath:idRelative"],
+        ["xpath=//auto-complete/div/ul/li[3]", "xpath:position"],
+        ["xpath=//li[contains(.,'PT1M')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "5320f384-0881-4e7a-b89f-33a57efb22ba",
+      "comment": "",
+      "command": "click",
+      "target": "css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label",
+      "targets": [
+        ["css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='/metadataFilters/SignatureValidation/requireSignedRoot.parent']/label", "xpath:idRelative"],
+        ["xpath=//div/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Require Signed Root')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f60a2a6e-2739-4da6-8e94-a5f0e7cf70de",
+      "comment": "",
+      "command": "click",
+      "target": "id=/metadataFilters/SignatureValidation/certificateFile",
+      "targets": [
+        ["id=/metadataFilters/SignatureValidation/certificateFile", "id"],
+        ["name=field30", "name"],
+        ["css=#\\/metadataFilters\\/SignatureValidation\\/certificateFile", "css:finder"],
+        ["xpath=//input[@id='/metadataFilters/SignatureValidation/certificateFile']", "xpath:attributes"],
+        ["xpath=//custom-string/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "d1402eee-5e5c-4634-ac31-6843ed775bb8",
+      "comment": "",
+      "command": "type",
+      "target": "id=/metadataFilters/SignatureValidation/certificateFile",
+      "targets": [
+        ["id=/metadataFilters/SignatureValidation/certificateFile", "id"],
+        ["name=field30", "name"],
+        ["css=#\\/metadataFilters\\/SignatureValidation\\/certificateFile", "css:finder"],
+        ["xpath=//input[@id='/metadataFilters/SignatureValidation/certificateFile']", "xpath:attributes"],
+        ["xpath=//custom-string/div/input", "xpath:position"]
+      ],
+      "value": "%{idp.home}/cert.key"
+    }, {
+      "id": "581415bb-bd83-4bc8-9417-da0a9781c7bd",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-success",
+      "targets": [
+        ["css=.btn-success", "css:finder"],
+        ["xpath=//array-component/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "6e976ed9-98a5-4e5d-8151-13a6c8498155",
+      "comment": "",
+      "command": "select",
+      "target": "id=/metadataFilters/EntityRoleWhiteList/retainedRoles/0",
+      "targets": [],
+      "value": "label=SPSSODescriptor"
+    }, {
+      "id": "4c21b4c9-6f8e-4520-b55c-9b945b97de01",
+      "comment": "",
+      "command": "click",
+      "target": "css=option:nth-child(2)",
+      "targets": [
+        ["css=option:nth-child(2)", "css:finder"],
+        ["xpath=//option[@value='1: SPSSODescriptor']", "xpath:attributes"],
+        ["xpath=//select[@id='/metadataFilters/EntityRoleWhiteList/retainedRoles/0']/option[2]", "xpath:idRelative"],
+        ["xpath=//option[2]", "xpath:position"],
+        ["xpath=//option[contains(.,'SPSSODescriptor')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "b027e53b-bdf7-40e5-a296-6f25eae50732",
+      "comment": "",
+      "command": "click",
+      "target": "css=#\\/metadataFilters\\/EntityRoleWhiteList\\/removeRolelessEntityDescriptors\\.parent > .custom-control-label",
+      "targets": [
+        ["css=#\\/metadataFilters\\/EntityRoleWhiteList\\/removeRolelessEntityDescriptors\\.parent > .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='/metadataFilters/EntityRoleWhiteList/removeRolelessEntityDescriptors.parent']/label", "xpath:idRelative"],
+        ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Remove Roleless Entity Descriptors?')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "939aa904-89cf-4063-9b95-15eeb6f2d43c",
       "comment": "",
       "command": "click",
       "target": "css=.next",
@@ -312,7 +519,7 @@
       ],
       "value": ""
     }, {
-      "id": "d02ae356-8086-4794-97ba-980fc75cca79",
+      "id": "c4d98111-537a-45a1-9bfd-e8d780a0c0b3",
       "comment": "",
       "command": "click",
       "target": "css=.custom-control-label",
@@ -324,7 +531,7 @@
       ],
       "value": ""
     }, {
-      "id": "dc60328b-d6e0-4f62-96c5-012f0fb5edc4",
+      "id": "a57a12dd-b641-46eb-afce-4c7be5a8f180",
       "comment": "",
       "command": "click",
       "target": "css=.save",
@@ -334,42 +541,35 @@
       ],
       "value": ""
     }, {
-      "id": "02e53e75-003b-42ce-8522-817d52ad16a3",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=td:nth-child(3)",
-      "targets": [],
-      "value": "10000"
-    }, {
-      "id": "7d059a57-60f7-4729-95af-b36619b98694",
+      "id": "8c52471a-70f5-43aa-b670-6f8d22e18668",
       "comment": "",
       "command": "verifyText",
       "target": "css=td:nth-child(3)",
       "targets": [
         ["css=td:nth-child(3)", "css:finder"],
         ["xpath=//td[3]", "xpath:position"],
-        ["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
+        ["xpath=//td[contains(.,'DynamicHttpMetadataResolver')]", "xpath:innerText"]
       ],
-      "value": "LocalDynamicMetadataResolver"
+      "value": "DynamicHttpMetadataResolver"
     }, {
-      "id": "15912a4b-c036-4886-9577-312bf6816943",
+      "id": "76629f3d-b0a3-40ac-b848-da22b0933c31",
       "comment": "",
       "command": "click",
-      "target": "linkText=Local Dynamic Metadata Provider",
+      "target": "linkText=Dynamic Http Metadata Provider",
       "targets": [
-        ["linkText=Local Dynamic Metadata Provider", "linkText"],
+        ["linkText=Dynamic Http Metadata Provider", "linkText"],
         ["css=td > a", "css:finder"],
-        ["xpath=//a[contains(text(),'Local Dynamic Metadata Provider')]", "xpath:link"],
-        ["xpath=//a[contains(@href, '/metadata/provider/dff5232d-66fb-4623-b25e-85c24df5ede4/configuration/options')]", "xpath:href"],
+        ["xpath=//a[contains(text(),'Dynamic Http Metadata Provider')]", "xpath:link"],
+        ["xpath=//a[contains(@href, '/metadata/provider/f5bb61ac-54fe-427e-8b6b-2fcdd66ba175/configuration/options')]", "xpath:href"],
         ["xpath=//td[2]/a", "xpath:position"],
-        ["xpath=//a[contains(.,'Local Dynamic Metadata Provider')]", "xpath:innerText"]
+        ["xpath=//a[contains(.,'Dynamic Http Metadata Provider')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "feb08e76-e553-4505-bffe-07f3e77206d0",
+      "id": "31a8587f-8ac0-4512-98ec-6cd230dfb0b6",
       "comment": "",
       "command": "click",
-      "target": "css=.btn:nth-child(2)",
+      "target": "css=.btn:nth-child(2) > translate-i18n",
       "targets": [
         ["css=.btn:nth-child(2) > translate-i18n", "css:finder"],
         ["xpath=//div[@id='navigation']/div/button/translate-i18n", "xpath:idRelative"],
@@ -378,7 +578,7 @@
       ],
       "value": ""
     }, {
-      "id": "2afa209b-d09b-468e-8cc3-d549abb3be4a",
+      "id": "fb7aea4e-7991-482c-b673-de998c20129c",
       "comment": "",
       "command": "click",
       "target": "css=#filters .actions span",
@@ -390,14 +590,14 @@
       ],
       "value": ""
     }, {
-      "id": "c4e0394c-ba68-4e75-8d20-174a91fad2f5",
+      "id": "990cf83b-5650-4b03-8b41-bdb5560a60fa",
       "comment": "",
       "command": "select",
       "target": "name=type",
       "targets": [],
       "value": "label=EntityAttributes"
     }, {
-      "id": "5f1229fb-9185-40cf-bd65-76435d93d7df",
+      "id": "5d3daf7a-a4e0-4767-a1ef-2416270bfae4",
       "comment": "",
       "command": "click",
       "target": "css=option:nth-child(2)",
@@ -409,33 +609,40 @@
       ],
       "value": ""
     }, {
-      "id": "03f838cb-2aea-40fa-b549-8263aa2046cf",
+      "id": "f013d7b6-96c3-4155-ac1e-cff223e5e547",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/name",
+      "targets": [],
+      "value": "10000"
+    }, {
+      "id": "a58e088d-329b-4cfb-949b-eea9fdbdad37",
       "comment": "",
       "command": "click",
       "target": "id=/name",
       "targets": [
         ["id=/name", "id"],
-        ["name=field20", "name"],
+        ["name=field39", "name"],
         ["css=#\\/name", "css:finder"],
         ["xpath=//input[@id='/name']", "xpath:attributes"],
         ["xpath=//input", "xpath:position"]
       ],
       "value": ""
     }, {
-      "id": "ad127dfe-2cae-4693-b65f-e35c0655e9eb",
+      "id": "60177908-3143-407a-8bdf-a045463d5490",
       "comment": "",
       "command": "type",
       "target": "id=/name",
       "targets": [
         ["id=/name", "id"],
-        ["name=field20", "name"],
+        ["name=field39", "name"],
         ["css=#\\/name", "css:finder"],
         ["xpath=//input[@id='/name']", "xpath:attributes"],
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Entity Attributes Filter"
     }, {
-      "id": "0065c161-84c6-4cd0-8b69-b257ec572915",
+      "id": "67d52837-5e50-487c-a744-9ee0ea39f5b7",
       "comment": "",
       "command": "click",
       "target": "id=/entityAttributesFilterTarget.target",
@@ -448,7 +655,7 @@
       ],
       "value": ""
     }, {
-      "id": "15d90ee0-b1cc-4fae-abec-ae80d93db1c1",
+      "id": "3512eb60-34d4-455b-8a2c-e6c98d382cac",
       "comment": "",
       "command": "type",
       "target": "id=/entityAttributesFilterTarget.target",
@@ -461,7 +668,7 @@
       ],
       "value": "unicon"
     }, {
-      "id": "1d754809-177b-47f9-98e6-5e757713d834",
+      "id": "a9d49b1c-c794-4c54-83ea-c61bd3011dba",
       "comment": "",
       "command": "click",
       "target": "css=.btn-success:nth-child(1)",
@@ -472,7 +679,7 @@
       ],
       "value": ""
     }, {
-      "id": "72c2bc1d-f96f-497b-bbd8-b2e254fae6b6",
+      "id": "dff6b5d5-02ae-41a1-bae4-6ce39aeca199",
       "comment": "",
       "command": "click",
       "target": "css=#\\/filterEnabled\\.parent > .custom-control-label",
@@ -484,104 +691,101 @@
       ],
       "value": ""
     }, {
-      "id": "1e74f318-f78c-4e64-8ac7-fc999df0dd19",
+      "id": "356339ea-0caf-406a-a2d6-b3eb991b7af6",
       "comment": "",
       "command": "click",
-      "target": "css=#\\/relyingPartyOverrides\\/turnOffEncryption\\.parent > .custom-control-label",
+      "target": "css=#\\/relyingPartyOverrides\\/omitNotBefore\\.parent > .custom-control-label",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/turnOffEncryption\\.parent > .custom-control-label", "css:finder"],
-        ["xpath=//div[@id='/relyingPartyOverrides/turnOffEncryption.parent']/label", "xpath:idRelative"],
-        ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"],
-        ["xpath=//label[contains(.,'Turn off Encryption of Response?')]", "xpath:innerText"]
+        ["css=#\\/relyingPartyOverrides\\/omitNotBefore\\.parent > .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='/relyingPartyOverrides/omitNotBefore.parent']/label", "xpath:idRelative"],
+        ["xpath=//div[6]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Omit Not Before Condition?')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "d05f7295-35b2-42ba-98d0-1c9673846190",
+      "id": "fdb64234-9424-4e0d-8be0-dd7c43859de3",
       "comment": "",
       "command": "click",
-      "target": "css=#\\/relyingPartyOverrides\\/useSha\\.parent > .custom-control-label",
+      "target": "css=#\\/relyingPartyOverrides\\/forceAuthn\\.parent > .custom-control-label",
       "targets": [
-        ["css=#\\/relyingPartyOverrides\\/useSha\\.parent > .custom-control-label", "css:finder"],
-        ["xpath=//div[@id='/relyingPartyOverrides/useSha.parent']/label", "xpath:idRelative"],
-        ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"],
-        ["xpath=//label[contains(.,'Use SHA1 Signing Algorithm?')]", "xpath:innerText"]
+        ["css=#\\/relyingPartyOverrides\\/forceAuthn\\.parent > .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='/relyingPartyOverrides/forceAuthn.parent']/label", "xpath:idRelative"],
+        ["xpath=//div[10]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Force AuthN')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "82bbe8c4-e66c-470d-bdf6-9cd3337b4a3e",
+      "id": "c722da17-b739-4fa6-b731-8b347e3c96e3",
       "comment": "",
       "command": "click",
-      "target": "id=/relyingPartyOverrides/responderId",
+      "target": "css=div:nth-child(8) .d-flex > .btn",
       "targets": [
-        ["id=/relyingPartyOverrides/responderId", "id"],
-        ["name=field33", "name"],
-        ["css=#\\/relyingPartyOverrides\\/responderId", "css:finder"],
-        ["xpath=//input[@id='/relyingPartyOverrides/responderId']", "xpath:attributes"],
-        ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"]
+        ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
+        ["xpath=//array-component/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "2e4c1077-cd2f-4298-969f-e945e2d68636",
+      "id": "93505bd6-8a5e-4ef0-8f50-d2dc9bce71d6",
       "comment": "",
-      "command": "type",
-      "target": "id=/relyingPartyOverrides/responderId",
+      "command": "click",
+      "target": "css=.input-group-append > .btn",
       "targets": [
-        ["id=/relyingPartyOverrides/responderId", "id"],
-        ["name=field33", "name"],
-        ["css=#\\/relyingPartyOverrides\\/responderId", "css:finder"],
-        ["xpath=//input[@id='/relyingPartyOverrides/responderId']", "xpath:attributes"],
-        ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"]
+        ["css=.input-group-append > .btn", "css:finder"],
+        ["xpath=(//button[@type='button'])[3]", "xpath:attributes"],
+        ["xpath=//div[@id='/relyingPartyOverrides/nameIdFormats/0-container']/div/div/button", "xpath:idRelative"],
+        ["xpath=//auto-complete/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
       ],
-      "value": "responder"
+      "value": ""
     }, {
-      "id": "14785e6f-8ab8-47e0-b16e-8e736638d8c8",
+      "id": "b269b8f4-8191-47c1-a84a-5b64df6aadcb",
       "comment": "",
       "command": "click",
-      "target": "css=div:nth-child(9) .d-flex > .btn",
+      "target": "id=/relyingPartyOverrides/nameIdFormats/0__option--2",
       "targets": [
-        ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
-        ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
+        ["id=/relyingPartyOverrides/nameIdFormats/0__option--2", "id"],
+        ["css=#\\/relyingPartyOverrides\\/nameIdFormats\\/0__option--2", "css:finder"],
+        ["xpath=//li[@id='/relyingPartyOverrides/nameIdFormats/0__option--2']", "xpath:attributes"],
+        ["xpath=//ul[@id='/relyingPartyOverrides/nameIdFormats/0__listbox']/li[3]", "xpath:idRelative"],
+        ["xpath=//auto-complete/div/ul/li[3]", "xpath:position"]
       ],
       "value": ""
     }, {
-      "id": "3e162911-9775-4d01-8802-63f5638c7cba",
+      "id": "c4431fc6-cbd3-4b7b-b1fd-b30141aa2af8",
       "comment": "",
       "command": "click",
-      "target": "css=.input-group-append > .btn",
+      "target": "css=tr:nth-child(6) .custom-control-label",
       "targets": [
-        ["css=.input-group-append > .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[3]", "xpath:attributes"],
-        ["xpath=//div[@id='/relyingPartyOverrides/authenticationMethods/0-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//auto-complete/div/div/div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
+        ["css=tr:nth-child(6) .custom-control-label", "css:finder"],
+        ["xpath=//tr[6]/td[2]/fieldset/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Toggle eduPersonAffiliation')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "ab2594b3-45a8-43f7-885b-270239a46628",
+      "id": "7b22d9b0-81f4-47c6-91f1-713c89cf9dd1",
       "comment": "",
       "command": "click",
-      "target": "id=/relyingPartyOverrides/authenticationMethods/0__option--0",
+      "target": "css=tr:nth-child(7) .custom-control-label",
       "targets": [
-        ["id=/relyingPartyOverrides/authenticationMethods/0__option--0", "id"],
-        ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0__option--0", "css:finder"],
-        ["xpath=//li[@id='/relyingPartyOverrides/authenticationMethods/0__option--0']", "xpath:attributes"],
-        ["xpath=//ul[@id='/relyingPartyOverrides/authenticationMethods/0__listbox']/li", "xpath:idRelative"],
-        ["xpath=//datalist-component/div/auto-complete/div/ul/li", "xpath:position"]
+        ["css=tr:nth-child(7) .custom-control-label", "css:finder"],
+        ["xpath=//tr[7]/td[2]/fieldset/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Toggle eduPersonScopedAffiliation')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "dd4e22ff-aa54-40c0-b5c2-6a5b79845062",
+      "id": "ad3ec36d-6e6a-4650-b7a1-0c8efaaeabe3",
       "comment": "",
       "command": "click",
-      "target": "css=.fa-check",
+      "target": "css=tr:nth-child(8) .custom-control-label",
       "targets": [
-        ["css=.fa-check", "css:finder"],
-        ["xpath=//button[@id='/attributeRelease.checkall']/i", "xpath:idRelative"],
-        ["xpath=//td[2]/button/i", "xpath:position"]
+        ["css=tr:nth-child(8) .custom-control-label", "css:finder"],
+        ["xpath=//tr[8]/td[2]/fieldset/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Toggle eduPersonPrimaryAffiliation')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "1c4c90ac-b644-4033-8ebc-07a8cd1bdbdd",
+      "id": "25090cbb-9e11-4938-b44e-70326857422d",
       "comment": "",
       "command": "click",
       "target": "css=.btn-primary",
@@ -593,14 +797,7 @@
       ],
       "value": ""
     }, {
-      "id": "af17a3a7-f292-4c22-8f2f-3d3bf1938fc1",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=.td-lg:nth-child(4)",
-      "targets": [],
-      "value": "10000"
-    }, {
-      "id": "2b9c0a43-fd7a-4ffa-bfef-a7fc41746e16",
+      "id": "e9f4ddf4-db8a-4bda-88cc-66173717986c",
       "comment": "",
       "command": "verifyText",
       "target": "css=.td-lg:nth-child(4)",
@@ -611,39 +808,25 @@
       ],
       "value": "EntityAttributes"
     }, {
-      "id": "a0e16e8d-91c9-416c-b1c1-a2898bfbd185",
+      "id": "9a99cc7c-55e1-4f62-bf18-e5936e8a98a7",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add Filter",
-      "targets": [
-        ["linkText=Add Filter", "linkText"],
-        ["css=.btn-success", "css:finder"],
-        ["xpath=//a[contains(@href, '/metadata/provider/ceb1cfdd-26c1-4134-baab-1438190ae9bd/filter/new')]", "xpath:href"],
-        ["xpath=//div[2]/a", "xpath:position"],
-        ["xpath=//a[contains(.,'Add Filter')]", "xpath:innerText"]
-      ],
-      "value": ""
-    }, {
-      "id": "11fd3e95-ce05-4ad0-8238-c34b696003cd",
-      "comment": "",
-      "command": "click",
-      "target": "name=type",
+      "target": "css=.btn-success",
       "targets": [
-        ["name=type", "name"],
-        ["css=.form-control", "css:finder"],
-        ["xpath=//select[@name='type']", "xpath:attributes"],
-        ["xpath=//select", "xpath:position"]
+        ["css=.btn-success > translate-i18n", "css:finder"],
+        ["xpath=//div[2]/a/translate-i18n", "xpath:position"],
+        ["xpath=//translate-i18n[contains(.,'Add Filter')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "0b68dd82-e9a5-447f-b062-9f7849529bcc",
+      "id": "30bd8306-1aa2-4151-9076-68ce955052c3",
       "comment": "",
       "command": "select",
       "target": "name=type",
       "targets": [],
       "value": "label=NameIDFormat"
     }, {
-      "id": "e85fde4c-cdbf-41c6-89e7-d4b281a16219",
+      "id": "a0388dc6-4668-48bb-ab21-2ecaaade5ff0",
       "comment": "",
       "command": "click",
       "target": "css=option:nth-child(3)",
@@ -655,40 +838,20 @@
       ],
       "value": ""
     }, {
-      "id": "a058bf22-7d07-4850-8004-8a85a2016d25",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "id=/name",
-      "targets": [],
-      "value": "10000"
-    }, {
-      "id": "8a94f318-76bb-49f1-90d5-b2dcbcb1ff80",
-      "comment": "",
-      "command": "click",
-      "target": "id=/name",
-      "targets": [
-        ["id=/name", "id"],
-        ["name=field40", "name"],
-        ["css=#\\/name", "css:finder"],
-        ["xpath=//input[@id='/name']", "xpath:attributes"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
-    }, {
-      "id": "9bd2419e-c4f5-4dd2-9fb8-278d70be987b",
+      "id": "be76769e-6422-4b1f-a2e4-00a32d394057",
       "comment": "",
       "command": "type",
       "target": "id=/name",
       "targets": [
         ["id=/name", "id"],
-        ["name=field40", "name"],
+        ["name=field59", "name"],
         ["css=#\\/name", "css:finder"],
         ["xpath=//input[@id='/name']", "xpath:attributes"],
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Name ID Format Filter"
     }, {
-      "id": "9b9d7604-7025-4ccb-bb95-862f57f696f1",
+      "id": "81373637-8e36-4736-9b2a-7b8d477dc2c1",
       "comment": "",
       "command": "click",
       "target": "id=/nameIdFormatFilterTarget.valuedd",
@@ -701,7 +864,7 @@
       ],
       "value": ""
     }, {
-      "id": "9e84c57f-c33d-48f8-85ac-ed50751eb37b",
+      "id": "f562c710-39fc-490d-80c9-d3525722397c",
       "comment": "",
       "command": "click",
       "target": "linkText=Regex",
@@ -715,82 +878,44 @@
       ],
       "value": ""
     }, {
-      "id": "f3bc22e2-0e3a-4d58-b992-31d687148c57",
+      "id": "c5dc3e04-eb5a-4885-92ed-3425da3026e6",
       "comment": "",
       "command": "sendKeys",
       "target": "id=/nameIdFormatFilterTarget.target",
       "targets": [],
       "value": "/foo.*/"
     }, {
-      "id": "343b40b9-87df-46ab-b3ef-285e4e5ed784",
+      "id": "d2cbc813-89e5-4801-a9fe-5e0e775a419f",
       "comment": "",
       "command": "click",
-      "target": "css=#\\/filterEnabled\\.parent > .custom-control-label",
+      "target": "css=#\\/removeExistingFormats\\.parent > .custom-control-label",
       "targets": [
-        ["css=#\\/filterEnabled\\.parent > .custom-control-label", "css:finder"],
-        ["xpath=//div[@id='/filterEnabled.parent']/label", "xpath:idRelative"],
-        ["xpath=//checkbox-component/div/div/div/label", "xpath:position"],
-        ["xpath=//label[contains(.,'Enable Filter?')]", "xpath:innerText"]
+        ["css=#\\/removeExistingFormats\\.parent > .custom-control-label", "css:finder"],
+        ["xpath=//div[@id='/removeExistingFormats.parent']/label", "xpath:idRelative"],
+        ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"],
+        ["xpath=//label[contains(.,'Remove Existing Formats?')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "6ce98c83-68b8-45c0-834e-cc40af11fc29",
+      "id": "77dfeb05-38e3-4ef8-9566-06e7597d464c",
       "comment": "",
       "command": "click",
-      "target": "css=.btn-success",
+      "target": "css=.btn-primary > translate-i18n",
       "targets": [
-        ["css=.btn-success", "css:finder"],
-        ["xpath=//array-component/div/div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"]
-      ],
-      "value": ""
-    }, {
-      "id": "a7aa04e7-b909-42cf-85ed-adbff0adefce",
-      "comment": "",
-      "command": "click",
-      "target": "css=.input-group-append > .btn",
-      "targets": [
-        ["css=.input-group-append > .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[3]", "xpath:attributes"],
-        ["xpath=//div[@id='/formats/0-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//auto-complete/div/div/div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
-      ],
-      "value": ""
-    }, {
-      "id": "8b7b79fd-2405-4ab6-8f91-4906f663cd1e",
-      "comment": "",
-      "command": "click",
-      "target": "id=/formats/0__option--1",
-      "targets": [
-        ["id=/formats/0__option--1", "id"],
-        ["css=#\\/formats\\/0__option--1", "css:finder"],
-        ["xpath=//li[@id='/formats/0__option--1']", "xpath:attributes"],
-        ["xpath=//ul[@id='/formats/0__listbox']/li[2]", "xpath:idRelative"],
-        ["xpath=//auto-complete/div/ul/li[2]", "xpath:position"]
-      ],
-      "value": ""
-    }, {
-      "id": "6d4c2c20-0855-4cdf-8e4d-dbbd6afb328b",
-      "comment": "",
-      "command": "click",
-      "target": "css=.btn-primary",
-      "targets": [
-        ["css=.btn-primary", "css:finder"],
-        ["xpath=//button[@type='submit']", "xpath:attributes"],
-        ["xpath=//div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
+        ["css=.btn-primary > translate-i18n", "css:finder"],
+        ["xpath=//div/button/translate-i18n", "xpath:position"],
+        ["xpath=//translate-i18n[contains(.,'Save')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
-      "id": "455e24c1-5093-4da3-a62d-457bbf0cd5db",
+      "id": "f79371b5-0081-45a0-bfb3-c403db903043",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(2) > .td-lg:nth-child(4)",
+      "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
       "targets": [],
       "value": "10000"
     }, {
-      "id": "9f7e95cf-4dd5-415f-8577-a6f1bc54a85d",
+      "id": "a8ed628c-53f7-4551-9ce8-fef976cc96ce",
       "comment": "",
       "command": "click",
       "target": "css=tr:nth-child(1) .fa-arrow-circle-down",
@@ -800,7 +925,7 @@
       ],
       "value": ""
     }, {
-      "id": "4a73b268-7d33-4e8c-8fa4-cb059be9768f",
+      "id": "be805934-2692-4a1c-a28f-afb3cc4eb5f4",
       "comment": "",
       "command": "verifyText",
       "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
@@ -811,7 +936,7 @@
       ],
       "value": "NameIDFormat"
     }, {
-      "id": "63ac7307-0538-4c0d-8e98-2f05c767baaf",
+      "id": "039aff93-c0de-40fb-a1c9-e22ffbf7e1da",
       "comment": "",
       "command": "click",
       "target": "css=tr:nth-child(1) .fa-arrow-circle-down",
@@ -821,7 +946,7 @@
       ],
       "value": ""
     }, {
-      "id": "ed8e07ff-0dce-47d6-8310-f1920bfe1367",
+      "id": "8f2da627-e8ad-473a-a71a-bec5dd1f0999",
       "comment": "",
       "command": "verifyText",
       "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",