diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
deleted file mode 100644
index 4f6b7e31a9c5b..0000000000000
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
-    <!--Go To Products page-->
-    <actionGroup name="GoToProductPage">
-        <click selector="{{GoToProductPageSection.catalog}}" stepKey="clickOnCatalog" />
-        <waitForPageLoad stepKey="waitForPage"/>
-        <click selector="{{GoToProductPageSection.product}}" stepKey="clickToSelectProductsItem" />
-        <waitForPageLoad stepKey="waitForPageProducts"/>
-    </actionGroup>
-
-    <!--Create Simple product-->
-    <actionGroup name="AdminCreateSimpleProduct">
-        <click selector="{{GoToProductPageSection.add}}" stepKey="clickToAddProduct"/>
-        <waitForPageLoad stepKey="WaitForProductPageIsLoaded"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProductOne.name}}" stepKey="setNameForProduct"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{SimpleProductOne.sku}}" stepKey="setSKUForProduct"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{SimpleProductOne.price}}" stepKey="setPriceForProduct"/>
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{SimpleProductOne.quantity}}"  stepKey="setQuantityForProduct"/>
-        <click selector="{{AdminProductFormSection.searchOptimization}}" stepKey="clickOnSearchEngineOptimization"/>
-        <fillField selector="{{AdminProductFormSection.urlKey}}" userInput="{{SimpleProductOne.urlKey}}" stepKey="setSearchUrlForProduct"/>
-        <click selector="{{AdminProductFormSection.saveButton}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad stepKey="WaitForProductSave"/>
-        <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
-    </actionGroup>
-
-    <actionGroup name="FindAndAddProductToCardActGr">
-        <click selector="{{StorefrontAddProductToCartSection.addToCartBtn}}" stepKey="addToCart"/>
-        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
-        <click selector="{{StorefrontAddProductToCartSection.showCard}}" stepKey="clickToOpenCard"/>
-        <waitForPageLoad stepKey="WaitForFormOpened"/>
-        <click selector="{{StorefrontAddProductToCartSection.proceed}}" stepKey="clickToProceedToCheckout"/>
-        <waitForPageLoad stepKey="waitForTheFormIsOpened"/>
-        <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
-    </actionGroup>
-
-    <actionGroup name="DeleteCreatedProductActionGroup">
-        <conditionalClick selector="{{DeleteCreatedProduct.clearAll}}" dependentSelector="{{DeleteCreatedProduct.clearAll}}" visible="1" stepKey="clickClearAllIfThereIsAnyValue"/>
-        <click stepKey="clickFilterButton" selector="{{DeleteCreatedProduct.filterButton}}"/>
-        <waitForElementVisible selector="{{DeleteCreatedProduct.filterSKUField}}" stepKey="waitForFilterDataLoaded"/>
-        <fillField stepKey="searchProductUsingSKUField" selector="{{DeleteCreatedProduct.filterSKUField}}" userInput="{{SimpleProductOne.sku}}"/>
-        <click stepKey="clickFiltersApplyButton" selector="{{DeleteCreatedProduct.filtersApplyButton}}"/>
-        <waitForElementNotVisible selector="{{DeleteCreatedProduct.filterSKUField}}" stepKey="waitForFilterBecomeNotVisible"/>
-        <click selector="{{DeleteCreatedProduct.createdProductID}}" stepKey="selectCreatedProduct"/>
-        <wait stepKey="waitSelectCreatedProduct" time="2"/>
-        <waitForElementVisible selector="{{DeleteCreatedProduct.actionSelectBox}}" stepKey="waitToSelectActionVisible" time="50"/>
-        <click stepKey="clickToSelectAction"  selector="{{DeleteCreatedProduct.actionSelectBox}}"/>
-        <waitForElementVisible selector="{{DeleteCreatedProduct.deleteButton}}" stepKey="waitForDeleteButtonAppeared" time="2"/>
-        <click selector="{{DeleteCreatedProduct.deleteButton}}" stepKey="clickToDeleteProduct"/>
-        <waitForElementVisible selector="{{DeleteCreatedProduct.okButton}}" stepKey="waitForOkButtonAppeared" time="2"/>
-        <click selector="{{DeleteCreatedProduct.okButton}}" stepKey="clickToConfirm"/>
-        <wait stepKey="waitForRecordIsDeleted" time="2"/>
-        <see userInput="A total of 1 record(s) have been deleted." stepKey="productDeletedSuccessfully"/>
-        <click stepKey="clickClearAllFilterButton" selector="{{DeleteCreatedProduct.clearAll}}"/>
-        <!-- We need this wait to make sure that Active filters is clear (waitForElementNotVisible tag doesn't wait until clearing filters)-->
-        <wait stepKey="waitToClearAllFilters" time="2"/>
-    </actionGroup>
-
-</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/SimpleProductData.xml b/app/code/Magento/Customer/Test/Mftf/Data/SimpleProductData.xml
deleted file mode 100644
index e9eacb6e37a11..0000000000000
--- a/app/code/Magento/Customer/Test/Mftf/Data/SimpleProductData.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="SimpleProductOne" type="product">
-        <data key="name" unique="suffix">testProduct</data>
-        <data key="sku" unique="suffix">testSku</data>
-        <data key="price">200</data>
-        <data key="quantity">100</data>
-        <data key="urlKey" unique="suffix">testProduct</data>
-    </entity>
-</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml
deleted file mode 100644
index cc0cf8e07008e..0000000000000
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontAddProductToCartSection">
-        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/>
-        <element name="successMsg" type="button" selector="div.message-success"/>
-        <element name="showCard" type="button" selector=".action.showcart"/>
-        <element name="proceed" type="button" selector="#top-cart-btn-checkout"/>
-    </section>
-
-    <section name="GoToProductPageSection">
-        <!--Go to Catalog/Products-->
-        <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
-        <element name="product" type="button" selector="//span[contains(text(), 'Products')]"/>
-        <element name="add" type="button" selector="#add_new_product-button"/>
-    </section>
-
-    <section name="AdminProductFormSection">
-        <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
-        <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input" timeout="30"/>
-        <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last" timeout="30"/>
-        <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
-        <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
-        <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>
-        <element name="enableProductLabel" type="checkbox" selector="input[name='product[status]']+label"/>
-        <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
-        <element name="productNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
-        <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
-        <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
-        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
-        <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
-        <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
-        <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
-        <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
-        <element name="productWeightSelect" type="select" selector="select[name='product[product_has_weight]']"/>
-        <element name="contentTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Content']"/>
-        <element name="fieldError" type="text" selector="//input[@name='product[{{fieldName}}]']/following-sibling::label[@class='admin__field-error']" parameterized="true"/>
-        <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
-        <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
-        <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
-        <element name="save" type="button" selector="#save"/>
-        <element name="attributeTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Attributes']"/>
-        <element name="attributeLabel" type="input" selector="//input[@name='frontend_label[0]']"/>
-        <element name="frontendInput" type="select" selector="select[name = 'frontend_input']"/>
-        <element name="productFormTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]" parameterized="true"/>
-        <element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
-        <element name="visibility" type="select" selector="//select[@name='product[visibility]']"/>
-        <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/>
-        <element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
-        <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
-        <element name="searchOptimization" type="button" selector="//*[contains(text(),'Search Engine Optimization')]"/>
-        <element name="urlKey" type="input" selector="//input[contains(@name,'url_key')]"/>
-        <element name="saveButton" type="button" selector="#save-button"/>
-    </section>
-
-    <section name="DeleteCreatedProduct">
-        <element name="searchToKeyword" type="input" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-search-control-wrap']/input"/>
-        <element name="searchButton" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-search-control-wrap']/button"/>
-        <element name="createdProductID" type="select" selector="//*[@class='data-grid-checkbox-cell-inner']/input"/>
-        <element name="actionSelectBox" type="button" selector="//*[@class='col-xs-2']//span[text()='Actions']"/>
-        <element name="deleteButton" type="button" selector="//div[@class='col-xs-2']//*[text()='Delete']"/>
-        <element name="okButton" type="button" selector=".action-primary.action-accept"/>
-        <element name="clearAll" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[contains(text(), 'Clear all')]"/>
-        <element name="filterButton" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-filters-action-wrap']/button"/>
-        <element name="filterSKUField" type="input" selector="//*[@name='sku']"/>
-        <element name="filtersApplyButton" type="button" selector="//*[contains(text(),'Apply Filters')]"/>
-    </section>
-
-</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
index 1359893ec090e..0e2ac68eb180b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
@@ -19,30 +19,27 @@
         </annotations>
 
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-            <actionGroup ref="GoToProductPage" stepKey="goToProductPage"/>
-            <actionGroup ref="AdminCreateSimpleProduct" stepKey="adminCreateSimpleProduct"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
         </before>
 
-         <!--Navigate to a category page -->
-        <amOnPage url="/{{SimpleProductOne.urlKey}}.html" stepKey="GoToProductPage"/>
-
+        <!--Navigate to a category page -->
+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
 
         <!-- Remove PHPSESSID and form_key to replicate an expired session-->
-        <executeJS function="var delete_cookie = function(name) {
-                            document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:01 UTC; path=/;';};
-                            delete_cookie('PHPSESSID');
-                            delete_cookie('form_key');" stepKey="removeCookies" after="waitForPageLoad"/>
+        <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+        <resetCookie userInput="form_key" stepKey="resetCookieForCart2"/>
 
         <!-- "Add to Cart" any product-->
-        <actionGroup ref="FindAndAddProductToCardActGr" stepKey="addProductToCard"/>
-
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" time="30" stepKey="assertErrorMessage"/>
         <after>
             <!--Delete created product-->
-            <amOnPage url="/admin" stepKey="GoToDashboard"/>
-            <actionGroup ref="GoToProductPage" stepKey="againGoToProductPage"/>
-            <actionGroup ref="DeleteCreatedProductActionGroup" stepKey="deleteCreatedProduct"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
 
     </test>