diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageSourcesGridPageTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageSourcesGridPageTest.xml
index 95b27fccb8c..3e03e584484 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageSourcesGridPageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageSourcesGridPageTest.xml
@@ -27,7 +27,7 @@
         </before>
         <after>
             <click selector="{{AdminGridDefaultViewControls.defaultView}}" stepKey="clickOnDefaultView3"/>
-            <click selector="{{AdminGridDefaultViewControls.viewByName('Default View')}}" stepKey="clickOnDefaultViewMenuOption1"/>
+            <click selector="{{AdminGridDefaultViewControls.viewByName(DefaultGridView.name)}}" stepKey="clickOnDefaultViewMenuOption1"/>
             <click selector="{{AdminGridColumnsControls.columns}}" stepKey="clickOnTheColumnsButton1"/>
             <click selector="{{AdminGridColumnsControls.reset}}" stepKey="clickOnResetToRestoreDefaultColumns1"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
@@ -81,7 +81,7 @@
         <dontSee selector="{{AdminGridHeaders.headerByName('Action')}}" userInput="Action" stepKey="dontSeeActionColumnHeader2"/>
 
         <click selector="{{AdminGridDefaultViewControls.defaultView}}" stepKey="clickOnDefaultView3"/>
-        <click selector="{{AdminGridDefaultViewControls.viewByName('Default View')}}" stepKey="clickOnDefaultViewMenuOption1"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(DefaultGridView.name)}}" stepKey="clickOnDefaultViewMenuOption1"/>
 
         <see selector="{{AdminGridHeaders.headerByName('Code')}}" userInput="Code" stepKey="seeCodeHeader3"/>
         <see selector="{{AdminGridHeaders.headerByName('Is Enabled')}}" userInput="Is Enabled" stepKey="seeIsEnabledHeader3"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageStocksGridPageTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageStocksGridPageTest.xml
index 7434b1b4f04..71bf92d1c41 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageStocksGridPageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminApplyDataViewsOnManageStocksGridPageTest.xml
@@ -26,7 +26,7 @@
         </before>
         <after>
             <click selector="{{AdminGridDefaultViewControls.defaultView}}" stepKey="clickOnDefaultView3"/>
-            <click selector="{{AdminGridDefaultViewControls.viewByName('Default View')}}" stepKey="clickOnDefaultViewMenuOption1"/>
+            <click selector="{{AdminGridDefaultViewControls.viewByName(DefaultGridView.name)}}" stepKey="clickOnDefaultViewMenuOption1"/>
             <click selector="{{AdminGridColumnsControls.columns}}" stepKey="clickOnTheColumnsButton1"/>
             <click selector="{{AdminGridColumnsControls.reset}}" stepKey="clickOnResetToRestoreDefaultColumns1"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
@@ -58,7 +58,7 @@
         <dontSee selector="{{AdminGridHeaders.headerByName('Sales Channels')}}" userInput="Sales Channels" stepKey="dontSeeSalesChannelColumn2"/>
 
         <click selector="{{AdminGridDefaultViewControls.defaultView}}" stepKey="clickOnDefaultView3"/>
-        <click selector="{{AdminGridDefaultViewControls.viewByName('Default View')}}" stepKey="clickOnDefaultViewMenuOption1"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(DefaultGridView.name)}}" stepKey="clickOnDefaultViewMenuOption1"/>
 
         <see selector="{{AdminGridHeaders.headerByName('ID')}}" userInput="ID" stepKey="seeTheHeaderId3"/>
         <see selector="{{AdminGridHeaders.headerByName('Name')}}" userInput="Name" stepKey="seeTheHeaderName3"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSelectDeselectManipulationsInManageStocksGridTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSelectDeselectManipulationsInManageStocksGridTest.xml
index e262c81d017..e218158a7a2 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminSelectDeselectManipulationsInManageStocksGridTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminSelectDeselectManipulationsInManageStocksGridTest.xml
@@ -75,7 +75,7 @@
         <amOnPage url="{{AdminManageStockPage.url}}" stepKey="amOnTheManageStockPage"/>
         <waitForPageLoad time="30" stepKey="waitForAdminManageStockPageLoad"/>
         <click selector="{{AdminGridDefaultViewControls.defaultView}}" stepKey="clickOnDefaultView3"/>
-        <click selector="{{AdminGridDefaultViewControls.viewByName('Default View')}}" stepKey="clickOnDefaultViewMenuOption1"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(DefaultGridView.name)}}" stepKey="clickOnDefaultViewMenuOption1"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <waitForPageLoad time="30" stepKey="waitFilterCleared"/>
         <actionGroup ref="AdminDataGridSelectPerPageActionGroup" stepKey="select20StocksPerPage">
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontPickUpSourceInfoSimpleProductCustomStockTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontPickUpSourceInfoSimpleProductCustomStockTest.xml
index d6621e38780..ac97a5156e8 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontPickUpSourceInfoSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontPickUpSourceInfoSimpleProductCustomStockTest.xml
@@ -45,8 +45,12 @@
             <amOnPage url="{{AdminEditSourcePage.url($culverSource.source[source_code]$)}}" stepKey="navigateToCulverSourceEditPage"/>
             <actionGroup ref="AdminAddImageToSourceDescriptionActionGroup" stepKey="addImage"/>
             <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-                 <argument name="FolderName" value="Storage Root"/>
+            <comment userInput="BIC workaround" stepKey="navigateToFolder"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
+            </actionGroup>
+            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
             </actionGroup>
             <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
@@ -69,6 +73,12 @@
         </before>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
+            </actionGroup>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
              <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>