diff --git a/dev/tests/acceptance/tests/_suite/sampleSuite.xml b/dev/tests/acceptance/tests/_suite/sampleSuite.xml
index f9b142d89c8a108349a2964e34146bbc20ca88c5..4172b526683d70b25725b6d3eea4db387e1d1a3a 100644
--- a/dev/tests/acceptance/tests/_suite/sampleSuite.xml
+++ b/dev/tests/acceptance/tests/_suite/sampleSuite.xml
@@ -9,14 +9,14 @@
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
     <suite name="mySuite">
         <before>
-            <createData entity="_defaultCategory" mergeKey="createCategory"/>
-            <createData entity="_defaultProduct" mergeKey="createProduct">
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
                 <required-entity createDataKey="createCategory"/>
             </createData>
         </before>
         <after>
-            <deleteData mergeKey="deleteMyProduct" createDataKey="createProduct"/>
-            <deleteData mergeKey="deleteMyCategory" createDataKey="createCategory"/>
+            <deleteData stepKey="deleteMyProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteMyCategory" createDataKey="createCategory"/>
         </after>
         <include>
             <group name="example"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
index a50d75c167c9c73409f57bb75fcc58799382fb58..67605e2dbe551ca03c606f52a38c897b593ebbef 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
@@ -26,11 +26,11 @@
                 <env value="phantomjs"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="amOnAdminLoginPage"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickOnSignIn"/>
-            <seeInCurrentUrl url="{{AdminLoginPage.url}}" mergeKey="seeAdminLoginUrl"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
+            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
+            <seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml
index 550e668b0808f9f09cd975edce496fe1b495997a..980eae28b6d227e4c3859741dff059c171312b82 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml
@@ -14,7 +14,7 @@
             <stories value="Create a Category via the Admin"/>
         </annotations>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" mergeKey="amOnLogoutPage"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
         </after>
         <test name="CreateCategoryViaAdmin">
             <annotations>
@@ -26,24 +26,24 @@
                 <env value="chrome"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="amOnAdminLoginPage"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickOnSignIn"/>
-            <amOnPage url="{{AdminCategoryPage.url}}" mergeKey="navigateToCategoryPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" mergeKey="clickOnAddSubCategory"/>
-            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" mergeKey="enterCategoryName"/>
-            <click selector="{{AdminCategorySEOSection.SectionHeader}}" mergeKey="openSEO"/>
-            <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleSubCategory.name_lwr}}" mergeKey="enterURLKey"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" mergeKey="saveCategory"/>
-            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" mergeKey="assertSuccess"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
+            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
+            <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+            <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="enterURLKey"/>
+            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
 
             <!-- Literal URL below, need to refactor line + StorefrontCategoryPage when support for variable URL is implemented-->
-            <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" mergeKey="goToCategoryFrontPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad2"/>
-            <seeInTitle userInput="{{SimpleSubCategory.name}}" mergeKey="assertTitle"/>
-            <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" mergeKey="assertInfo1"/>
+            <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertTitle"/>
+            <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="assertInfo1"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml
index f649580554eaa8703a9e77627eecfbb243172e9f..c2756445f6268c474c91f38e114dcdd559283304 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml
@@ -14,7 +14,7 @@
             <stories value="Create a Simple Product via Admin"/>
         </annotations>
         <before>
-            <createData entity="_defaultCategory" mergeKey="createPreReqCategory"/>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
         </before>
         <test name="CreateSimpleProductViaAdmin">
             <annotations>
@@ -26,45 +26,45 @@
                 <env value="chrome"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="navigateToAdmin"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" mergeKey="fillUsername"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickLogin"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" mergeKey="navigateToProductIndex"/>
-            <click selector="{{AdminProductGridActionSection.addProductToggle}}" mergeKey="clickAddProductDropdown"/>
-            <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" mergeKey="clickAddSimpleProduct"/>
-            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" mergeKey="fillName"/>
-            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" mergeKey="fillSKU"/>
-            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" mergeKey="fillPrice"/>
-            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" mergeKey="fillQuantity"/>
-            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createPreReqCategory.name$$]" mergeKey="searchAndSelectCategory"/>
-            <click selector="{{AdminProductSEOSection.sectionHeader}}" mergeKey="openSeoSection"/>
-            <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" mergeKey="fillUrlKey"/>
-            <click selector="{{AdminProductFormActionSection.saveButton}}" mergeKey="saveProduct"/>
-            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" mergeKey="assertSaveMessageSuccess"/>
-            <seeInField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" mergeKey="assertFieldName"/>
-            <seeInField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" mergeKey="assertFieldSku"/>
-            <seeInField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" mergeKey="assertFieldPrice"/>
-            <click selector="{{AdminProductSEOSection.sectionHeader}}" mergeKey="openSeoSectionAssert"/>
-            <seeInField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" mergeKey="assertFieldUrlKey"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+            <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
+            <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+            <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createPreReqCategory.name$$]" stepKey="searchAndSelectCategory"/>
+            <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+            <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+            <seeInField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
+            <seeInField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
+            <seeInField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
+            <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
+            <seeInField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
 
             <!-- Go to storefront category page, assert product visibility -->
-            <amOnPage url="{{StorefrontCategoryPage.url($$createPreReqCategory.name$$)}}" mergeKey="navigateToCategoryPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <see userInput="{{_defaultProduct.name}}" mergeKey="assertProductPresent"/>
-            <see userInput="{{_defaultProduct.price}}" mergeKey="assertProductPricePresent"/>
+            <amOnPage url="{{StorefrontCategoryPage.url($$createPreReqCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
+            <see userInput="{{_defaultProduct.price}}" stepKey="assertProductPricePresent"/>
 
             <!-- Go to storefront product page, assert product visibility -->
-            <amOnPage url="{{_defaultProduct.urlKey}}.html" mergeKey="navigateToProductPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad2"/>
-            <seeInTitle userInput="{{_defaultProduct.name}}" mergeKey="assertProductNameTitle"/>
-            <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" mergeKey="assertProductName"/>
-            <see userInput="{{_defaultProduct.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" mergeKey="assertProductPrice"/>
-            <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" mergeKey="assertProductSku"/>
+            <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
+            <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+            <see userInput="{{_defaultProduct.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+            <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
         </test>
         <after>
-            <deleteData createDataKey="createPreReqCategory" mergeKey="deletePreReqCategory"/>
-            <amOnPage url="admin/admin/auth/logout/" mergeKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
         </after>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml
index 5e97a6ab03b1b5f02f37913a0ea86962b9449d55..1da632eaae16fdf5b291b9cd11b16bc1a7e362eb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml
@@ -14,16 +14,16 @@
             <stories value="Checkout via the Admin"/>
         </annotations>
         <before>
-            <createData entity="SimpleSubCategory" mergeKey="simplecategory"/>
-            <createData entity="SimpleProduct" mergeKey="simpleproduct1">
+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
+            <createData entity="SimpleProduct" stepKey="simpleproduct1">
                 <required-entity createDataKey="simplecategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" mergeKey="simpleuscustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
         </before>
         <after>
-            <deleteData createDataKey="simpleproduct1" mergeKey="deleteProduct1"/>
-            <deleteData createDataKey="simplecategory" mergeKey="deleteCategory"/>
-            <deleteData createDataKey="simpleuscustomer" mergeKey="deleteCustomer"/>
+            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="simpleuscustomer" stepKey="deleteCustomer"/>
         </after>
         <test name="CustomerCheckoutTest">
             <annotations>
@@ -36,52 +36,52 @@
                 <env value="headless"/>
             </annotations>
 
-            <amOnPage mergeKey="s1"  url="customer/account/login/"/>
-            <fillField  mergeKey="s3" userInput="$$simpleuscustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-            <fillField  mergeKey="s5" userInput="$$simpleuscustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-            <click mergeKey="s7" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <waitForPageLoad mergeKey="s9"/>
+            <amOnPage stepKey="s1"  url="customer/account/login/"/>
+            <fillField  stepKey="s3" userInput="$$simpleuscustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+            <fillField  stepKey="s5" userInput="$$simpleuscustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+            <click stepKey="s7" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+            <waitForPageLoad stepKey="s9"/>
 
-            <amOnPage mergeKey="s11" url="/$$simplecategory.name$$.html" />
-            <moveMouseOver mergeKey="s15" selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" />
-            <click mergeKey="s17" selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" />
-            <waitForElementVisible mergeKey="s21" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" />
-            <see mergeKey="s23" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart."/>
-            <see mergeKey="s25" selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" />
-            <click mergeKey="s27" selector="{{StorefrontMiniCartSection.show}}" />
-            <click mergeKey="s31" selector="{{StorefrontMiniCartSection.goToCheckout}}" />
-            <waitForPageLoad mergeKey="s33"/>
-            <waitForLoadingMaskToDisappear mergeKey="s34"/>
-            <click mergeKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-            <waitForElement mergeKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-            <click mergeKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
-            <waitForPageLoad mergeKey="s39"/>
-            <waitForElement mergeKey="s41" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
-            <see mergeKey="s47" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-            <click mergeKey="s49" selector="{{CheckoutPaymentSection.placeOrder}}" />
-            <waitForPageLoad mergeKey="s51"/>
-            <grabTextFrom mergeKey="s53" selector="{{CheckoutSuccessMainSection.orderNumber22}}" returnVariable="orderNumber" />
-            <see mergeKey="s55" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
+            <amOnPage stepKey="s11" url="/$$simplecategory.name$$.html" />
+            <moveMouseOver stepKey="s15" selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" />
+            <click stepKey="s17" selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" />
+            <waitForElementVisible stepKey="s21" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" />
+            <see stepKey="s23" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart."/>
+            <see stepKey="s25" selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" />
+            <click stepKey="s27" selector="{{StorefrontMiniCartSection.show}}" />
+            <click stepKey="s31" selector="{{StorefrontMiniCartSection.goToCheckout}}" />
+            <waitForPageLoad stepKey="s33"/>
+            <waitForLoadingMaskToDisappear stepKey="s34"/>
+            <click stepKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
+            <waitForElement stepKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
+            <click stepKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
+            <waitForPageLoad stepKey="s39"/>
+            <waitForElement stepKey="s41" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
+            <see stepKey="s47" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+            <click stepKey="s49" selector="{{CheckoutPaymentSection.placeOrder}}" />
+            <waitForPageLoad stepKey="s51"/>
+            <grabTextFrom stepKey="s53" selector="{{CheckoutSuccessMainSection.orderNumber22}}" returnVariable="orderNumber" />
+            <see stepKey="s55" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
 
-            <amOnPage mergeKey="s59" url="{{AdminLoginPage.url}}" />
-            <fillField mergeKey="s61" selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" />
-            <fillField mergeKey="s63" selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" />
-            <click mergeKey="s65" selector="{{AdminLoginFormSection.signIn}}" />
+            <amOnPage stepKey="s59" url="{{AdminLoginPage.url}}" />
+            <fillField stepKey="s61" selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" />
+            <fillField stepKey="s63" selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" />
+            <click stepKey="s65" selector="{{AdminLoginFormSection.signIn}}" />
 
-            <amOnPage mergeKey="s67" url="{{OrdersPage.url}}"/>
-            <waitForPageLoad mergeKey="s75"/>
-            <fillField mergeKey="s77" selector="{{OrdersGridSection.search}}" variable="orderNumber" />
-            <waitForPageLoad mergeKey="s78"/>
+            <amOnPage stepKey="s67" url="{{OrdersPage.url}}"/>
+            <waitForPageLoad stepKey="s75"/>
+            <fillField stepKey="s77" selector="{{OrdersGridSection.search}}" variable="orderNumber" />
+            <waitForPageLoad stepKey="s78"/>
 
-            <click mergeKey="s81" selector="{{OrdersGridSection.submitSearch22}}" />
-            <waitForPageLoad mergeKey="s831"/>
-            <click mergeKey="s84" selector="{{OrdersGridSection.firstRow}}" />
-            <see mergeKey="s85" selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
-            <see mergeKey="s87" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
-            <see mergeKey="s89" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
-            <see mergeKey="s91" selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-            <see mergeKey="s93" selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-            <see mergeKey="s95" selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
+            <click stepKey="s81" selector="{{OrdersGridSection.submitSearch22}}" />
+            <waitForPageLoad stepKey="s831"/>
+            <click stepKey="s84" selector="{{OrdersGridSection.firstRow}}" />
+            <see stepKey="s85" selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
+            <see stepKey="s87" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
+            <see stepKey="s89" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
+            <see stepKey="s91" selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+            <see stepKey="s93" selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+            <see stepKey="s95" selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml
index fa441fd673784b65c8f768739c7d2dfb703a5fce..2aa0a77b0a0d1d72d52551f6702129c9ade0fb22 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml
@@ -14,14 +14,14 @@
             <stories value="Checkout via Guest Checkout"/>
         </annotations>
         <before>
-            <createData entity="_defaultCategory" mergeKey="createCategory"/>
-            <createData entity="_defaultProduct" mergeKey="createProduct">
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
                 <required-entity createDataKey="createCategory"/>
             </createData>
         </before>
         <after>
-            <deleteData createDataKey="createCategory" mergeKey="deleteCategory"/>
-            <deleteData createDataKey="createProduct" mergeKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         </after>
         <test name="GuestCheckoutTest">
             <annotations>
@@ -33,51 +33,51 @@
                 <env value="chrome"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" mergeKey="onCategoryPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" mergeKey="hoverProduct"/>
-            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" mergeKey="addToCart"/>
-            <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" mergeKey="waitForProductAdded"/>
-            <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." mergeKey="seeAddedToCartMessage"/>
-            <see selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" mergeKey="seeCartQuantity"/>
-            <click selector="{{StorefrontMiniCartSection.show}}" mergeKey="clickCart"/>
-            <click selector="{{StorefrontMiniCartSection.goToCheckout}}" mergeKey="goToCheckout"/>
-            <waitForPageLoad mergeKey="waitForPageLoad2"/>
-            <fillField selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" mergeKey="enterEmail"/>
-            <fillField selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" mergeKey="enterFirstName"/>
-            <fillField selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" mergeKey="enterLastName"/>
-            <fillField selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" mergeKey="enterStreet"/>
-            <fillField selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" mergeKey="enterCity"/>
-            <selectOption selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" mergeKey="selectRegion"/>
-            <fillField selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" mergeKey="enterPostcode"/>
-            <fillField selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" mergeKey="enterTelephone"/>
-            <waitForLoadingMaskToDisappear mergeKey="waitForLoadingMask"/>
-            <click selector="{{GuestCheckoutShippingSection.firstShippingMethod}}" mergeKey="selectFirstShippingMethod"/>
-            <waitForElement selector="{{GuestCheckoutShippingSection.next}}" time="30" mergeKey="waitForNextButton"/>
-            <click selector="{{GuestCheckoutShippingSection.next}}" mergeKey="clickNext"/>
-            <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" mergeKey="waitForPlaceOrderButton"/>
-            <see selector="{{GuestCheckoutPaymentSection.cartItems}}" userInput="{{_defaultProduct.name}}" mergeKey="seeProductInCart"/>
-            <see selector="{{GuestCheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" mergeKey="seeAddress"/>
-            <click selector="{{GuestCheckoutPaymentSection.placeOrder}}" mergeKey="clickPlaceOrder"/>
-            <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" returnVariable="orderNumber" mergeKey="grabOrderNumber"/>
-            <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order # is:" mergeKey="seeOrderNumber"/>
-            <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." mergeKey="seeEmailYou"/>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="navigateToAdmin"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickLogin"/>
-            <amOnPage url="{{OrdersPage.url}}" mergeKey="onOrdersPage"/>
-            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="30" mergeKey="waitForOrdersPage"/>
-            <fillField selector="{{OrdersGridSection.search}}" variable="orderNumber" mergeKey="fillOrderNum"/>
-            <click selector="{{OrdersGridSection.submitSearch}}" mergeKey="submitSearchOrderNum"/>
-            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="30" mergeKey="waitForOrdersPage2"/>
-            <click selector="{{OrdersGridSection.firstRow}}" mergeKey="clickOrderRow"/>
-            <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" mergeKey="seeAdminOrderStatus"/>
-            <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Guest" mergeKey="seeAdminOrderGuest"/>
-            <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" mergeKey="seeAdminOrderEmail"/>
-            <see selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" mergeKey="seeAdminOrderBillingAddress"/>
-            <see selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" mergeKey="seeAdminOrderShippingAddress"/>
-            <see selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="{{_defaultProduct.name}}" mergeKey="seeAdminOrderProduct"/>
+            <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+            <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+            <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+            <see selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+            <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
+            <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <fillField selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+            <fillField selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+            <fillField selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+            <fillField selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+            <fillField selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+            <selectOption selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+            <fillField selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+            <fillField selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+            <click selector="{{GuestCheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+            <waitForElement selector="{{GuestCheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+            <click selector="{{GuestCheckoutShippingSection.next}}" stepKey="clickNext"/>
+            <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+            <see selector="{{GuestCheckoutPaymentSection.cartItems}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductInCart"/>
+            <see selector="{{GuestCheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAddress"/>
+            <click selector="{{GuestCheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+            <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" returnVariable="orderNumber" stepKey="grabOrderNumber"/>
+            <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order # is:" stepKey="seeOrderNumber"/>
+            <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeEmailYou"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+            <amOnPage url="{{OrdersPage.url}}" stepKey="onOrdersPage"/>
+            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="30" stepKey="waitForOrdersPage"/>
+            <fillField selector="{{OrdersGridSection.search}}" variable="orderNumber" stepKey="fillOrderNum"/>
+            <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="30" stepKey="waitForOrdersPage2"/>
+            <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+            <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
+            <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
+            <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
+            <see selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
+            <see selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
+            <see selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="{{_defaultProduct.name}}" stepKey="seeAdminOrderProduct"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
index e6dfb969fe2182f4fa9ad428e7cdcea3ab6095fb..fde1baac0c4432993ba67a61b085eeeef3860025 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
@@ -14,7 +14,7 @@
             <stories value="Create a CMS Page via the Admin"/>
         </annotations>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" mergeKey="amOnLogoutPage"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
         </after>
         <test name="CreateNewPage">
             <annotations>
@@ -28,26 +28,26 @@
                 <env value="firefox"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="navigateToAdmin"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickLogin"/>
-            <amOnPage url="{{CmsPagesPage.url}}" mergeKey="amOnPagePagesGrid"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <click selector="{{CmsPagesPageActionsSection.addNewPage}}" mergeKey="clickAddNewPage"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" mergeKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" mergeKey="clickExpandContent"/>
-            <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_defaultCmsPage.content_heading}}" mergeKey="fillFieldContentHeading"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <click selector="{{CmsPagesPageActionsSection.addNewPage}}" stepKey="clickAddNewPage"/>
+            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+            <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_defaultCmsPage.content_heading}}" stepKey="fillFieldContentHeading"/>
             <!-- As of 2017/11/15, this test is failing here (Jenkins only, works locally). See MQE-282. -->
-            <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{_defaultCmsPage.content}}" mergeKey="fillFieldContent"/>
-            <click selector="{{CmsNewPagePageSeoSection.header}}" mergeKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" mergeKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" mergeKey="clickSavePage"/>
-            <see userInput="You saved the page." mergeKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" mergeKey="amOnPageTestPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad2"/>
-            <see userInput="{{_defaultCmsPage.content_heading}}" mergeKey="seeContentHeading"/>
-            <see userInput="{{_defaultCmsPage.content}}" mergeKey="seeContent"/>
+            <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{_defaultCmsPage.content}}" stepKey="fillFieldContent"/>
+            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <see userInput="{{_defaultCmsPage.content_heading}}" stepKey="seeContentHeading"/>
+            <see userInput="{{_defaultCmsPage.content}}" stepKey="seeContent"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
index fbcc2581b408932bf0fec442a0077592d7c6d5a8..1e1475e154cd3f1e3c25c1ebebb1d3fa94454e33 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
@@ -14,10 +14,10 @@
             <stories value="Create a Configurable Product via the Admin"/>
         </annotations>
         <before>
-            <loginAsAdmin mergeKey="loginAsAdmin"/>
+            <loginAsAdmin stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" mergeKey="amOnLogoutPage"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
         </after>
         <test name="CreateConfigurableProductViaAdmin">
             <annotations>
@@ -30,105 +30,105 @@
                 <env value="chrome"/>
             </annotations>
 
-            <amOnPage url="{{AdminCategoryPage.url}}" mergeKey="amOnCategoryGridPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-
-            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" mergeKey="clickOnAddSubCategory"/>
-            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" mergeKey="enterCategoryName"/>
-            <click selector="{{AdminCategorySEOSection.SectionHeader}}" mergeKey="clickOnSeoSection"/>
-            <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" mergeKey="enterUrlKey"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" mergeKey="clickOnSaveCategory"/>
-            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" mergeKey="assertSuccessMessage"/>
-
-            <amOnPage url="{{AdminProductIndexPage.url}}" mergeKey="amOnProductGridPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad2"/>
-            <click selector="{{AdminProductGridActionSection.addProductToggle}}" mergeKey="clickOnAddProductToggle"/>
-            <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" mergeKey="clickOnAddConfigurableProduct"/>
-            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" mergeKey="fillName"/>
-            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" mergeKey="fillSKU"/>
-            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" mergeKey="fillPrice"/>
-            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" mergeKey="fillQuantity"/>
-            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{_defaultCategory.name}}]" mergeKey="searchAndSelectCategory"/>
-            <click selector="{{AdminProductSEOSection.sectionHeader}}" mergeKey="openSeoSection"/>
-            <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" mergeKey="fillUrlKey"/>
-
-            <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" mergeKey="clickOnCreateConfigurations"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" mergeKey="clickOnNewAttribute"/>
-            <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" mergeKey="switchToNewAttributeIFrame"/>
-            <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" mergeKey="fillDefaultLabel"/>
-            <click selector="{{AdminNewAttributePanel.saveAttribute}}" mergeKey="clickOnNewAttributePanel"/>
-
-            <switchToIFrame mergeKey="switchOutOfIFrame"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" mergeKey="clickOnFilters"/>
-            <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" mergeKey="fillFilterAttributeCodeField"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" mergeKey="clickApplyFiltersButton"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" mergeKey="clickOnFirstCheckbox"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" mergeKey="clickOnNextButton1"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" mergeKey="clickOnCreateNewValue1"/>
-            <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" mergeKey="fillFieldForNewAttribute1"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" mergeKey="clickOnSaveNewAttribute1"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" mergeKey="clickOnCreateNewValue2"/>
-            <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" mergeKey="fillFieldForNewAttribute2"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" mergeKey="clickOnSaveNewAttribute2"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" mergeKey="clickOnCreateNewValue3"/>
-            <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" mergeKey="fillFieldForNewAttribute3"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" mergeKey="clickOnSaveNewAttribute3"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" mergeKey="clickOnSelectAll"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" mergeKey="clickOnNextButton2"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" mergeKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
-            <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" mergeKey="selectAttributes"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" mergeKey="fillAttributePrice1"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" mergeKey="fillAttributePrice2"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" mergeKey="fillAttributePrice3"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" mergeKey="clickOnApplySingleQuantityToEachSku"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" mergeKey="enterAttributeQuantity"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" mergeKey="clickOnNextButton3"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" mergeKey="clickOnNextButton4"/>
-
-            <click selector="{{AdminProductFormActionSection.saveButton}}" mergeKey="clickOnSaveButton2"/>
-            <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" mergeKey="clickOnConfirmInPopup"/>
-
-            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" mergeKey="seeSaveProductMessage"/>
-            <seeInTitle userInput="{{_defaultProduct.name}}" mergeKey="seeProductNameInTitle"/>
-
-            <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" mergeKey="seeNumberOfRows"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" mergeKey="seeAttributeName1InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" mergeKey="seeAttributeName2InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" mergeKey="seeAttributeName3InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" mergeKey="seeAttributeSku1InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" mergeKey="seeAttributeSku2InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" mergeKey="seeAttributeSku3InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" mergeKey="seeUniquePrice1InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" mergeKey="seeUniquePrice2InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" mergeKey="seeUniquePrice3InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" mergeKey="seeQuantityInField"/>
-
-            <amOnPage url="/" mergeKey="amOnStorefront"/>
-            <waitForPageLoad mergeKey="waitForPageLoad3"/>
-
-            <click userInput="{{_defaultCategory.name}}" mergeKey="clickOnCategoryName"/>
-            <waitForPageLoad mergeKey="waitForPageLoad4"/>
-
-            <see userInput="{{_defaultProduct.name}}" mergeKey="assertProductPresent"/>
-            <see userInput="{{colorProductAttribute1.price}}" mergeKey="assertProductPricePresent"/>
-            <click userInput="{{_defaultProduct.name}}" mergeKey="clickOnProductName"/>
-            <waitForPageLoad mergeKey="waitForPageLoad5"/>
-
-            <seeInTitle userInput="{{_defaultProduct.name}}" mergeKey="assertProductNameTitle"/>
-            <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" mergeKey="assertProductName"/>
-            <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" mergeKey="assertProductPrice"/>
-            <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" mergeKey="assertProductSku"/>
-
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" mergeKey="seeColorAttributeName1"/>
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" mergeKey="seeInDropDown1"/>
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" mergeKey="seeInDropDown2"/>
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" mergeKey="seeInDropDown3"/>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryGridPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+
+            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="enterCategoryName"/>
+            <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSeoSection"/>
+            <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterUrlKey"/>
+            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickOnSaveCategory"/>
+            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
+
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
+            <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
+            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{_defaultCategory.name}}]" stepKey="searchAndSelectCategory"/>
+            <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+            <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+            <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
+            <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+            <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
+            <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+
+            <switchToIFrame stepKey="switchOutOfIFrame"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
+            <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+
+            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
+            <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
+
+            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
+            <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
+
+            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
+            <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
+
+            <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+
+            <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
+            <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
+            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
+            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
+            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
+
+            <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+            <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+            <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+
+            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+            <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitle"/>
+
+            <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeName3InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeSku1InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeSku2InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeSku3InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" stepKey="seeUniquePrice1InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" stepKey="seeUniquePrice2InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/>
+            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
+
+            <amOnPage url="/" stepKey="amOnStorefront"/>
+            <waitForPageLoad stepKey="waitForPageLoad3"/>
+
+            <click userInput="{{_defaultCategory.name}}" stepKey="clickOnCategoryName"/>
+            <waitForPageLoad stepKey="waitForPageLoad4"/>
+
+            <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
+            <see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
+            <click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
+            <waitForPageLoad stepKey="waitForPageLoad5"/>
+
+            <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
+            <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+            <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+            <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+
+            <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
+            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
+            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
+            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml
index b577bca92e34f747dda87b98b4d83a3894471b74..da72ffd45ea28e73c0dc27fa9b4df5611269844d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml
@@ -24,26 +24,26 @@
                 <env value="chrome"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="navigateToAdmin"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" mergeKey="fillUsername"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickLogin"/>
-            <amOnPage url="{{AdminCustomerPage.url}}" mergeKey="navigateToCustomers"/>
-            <click selector="{{AdminCustomerMainActionsSection.addNewCustomer}}" mergeKey="clickCreateCustomer"/>
-            <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminNewCustomerAccountInformationSection.firstName}}" mergeKey="fillFirstName"/>
-            <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminNewCustomerAccountInformationSection.lastName}}" mergeKey="fillLastName"/>
-            <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminNewCustomerAccountInformationSection.email}}" mergeKey="fillEmail"/>
-            <click selector="{{AdminNewCustomerMainActionsSection.saveButton}}" mergeKey="saveCustomer"/>
-            <waitForElementNotVisible selector="div [data-role='spinner']" time="10" mergeKey="waitForSpinner1"/>
-            <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" mergeKey="assertSuccessMessage"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+            <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
+            <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+            <click selector="{{AdminCustomerMainActionsSection.addNewCustomer}}" stepKey="clickCreateCustomer"/>
+            <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminNewCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+            <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminNewCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+            <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminNewCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+            <click selector="{{AdminNewCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+            <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner1"/>
+            <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
 
-            <click selector="{{AdminCustomerFiltersSection.filtersButton}}" mergeKey="openFilter"/>
-            <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerFiltersSection.nameInput}}" mergeKey="filterFirstName"/>
-            <click selector="{{AdminCustomerFiltersSection.apply}}" mergeKey="applyFilter"/>
-            <waitForElementNotVisible selector="div [data-role='spinner']" time="10" mergeKey="waitForSpinner2"/>
-            <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" mergeKey="assertFirstName"/>
-            <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" mergeKey="assertLastName"/>
-            <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" mergeKey="assertEmail"/>
+            <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
+            <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerFiltersSection.nameInput}}" stepKey="filterFirstName"/>
+            <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
+            <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner2"/>
+            <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+            <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+            <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml
index 37fe0017b8685108e649e6f1800e39b54d20a29a..36c97c56d0f7d2ea2776f88bbf0a411d2407ba53 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml
@@ -25,18 +25,18 @@
                 <env value="firefox"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage mergeKey="amOnStorefrontPage"  url="/"/>
-            <click mergeKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
-            <fillField  mergeKey="fillFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
-            <fillField  mergeKey="fillLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
-            <fillField  mergeKey="fillEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
-            <fillField  mergeKey="fillPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
-            <fillField  mergeKey="fillConfirmPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
-            <click mergeKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-            <see mergeKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
-            <see mergeKey="seeFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see mergeKey="seeLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see mergeKey="seeEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
+            <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
+            <fillField  stepKey="fillFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
+            <fillField  stepKey="fillLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
+            <fillField  stepKey="fillEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
+            <fillField  stepKey="fillPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
+            <fillField  stepKey="fillConfirmPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
+            <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
+            <see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
+            <see stepKey="seeFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <see stepKey="seeLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <see stepKey="seeEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         </test>
     </cest>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
index 2e039b51bf107433c1269bf790e510b061fe6d50..6c79e31478c9ac8df69242801e2acdc2a7e31396 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
@@ -14,10 +14,10 @@
             <stories value="Persisted customer can login from storefront."/>
         </annotations>
         <before>
-            <createData mergeKey="customer" entity="Simple_US_Customer"/>
+            <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
-            <deleteData mergeKey="deleteCustomer" createDataKey="customer" />
+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
         <test name="StorefrontPersistedCustomerLoginTest">
             <annotations>
@@ -31,13 +31,13 @@
                 <env value="phantomjs"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage mergeKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-            <fillField  mergeKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-            <fillField  mergeKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-            <click mergeKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <see mergeKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see mergeKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see mergeKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+            <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+            <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+            <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+            <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml
index c043fe298f7674f97be8fd43a458eca86c7db740..f27ac7d37af33b97da17e617e37c4ce0cf29d0b2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml
@@ -14,8 +14,8 @@
             <stories value="Create an Invoice via the Admin"/>
         </annotations>
         <before>
-            <createData entity="_defaultCategory" mergeKey="createCategory"/>
-            <createData entity="_defaultProduct" mergeKey="createProduct">
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
                 <required-entity createDataKey="createCategory"/>
             </createData>
         </before>
@@ -32,59 +32,59 @@
             </annotations>
 
             <!-- todo: Create an order via the api instead of driving the browser  -->
-            <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" mergeKey="onCategoryPage"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" mergeKey="hoverProduct"/>
-            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" mergeKey="addToCart"/>
-            <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" mergeKey="waitForProductAdded"/>
-            <click selector="{{StorefrontMiniCartSection.show}}" mergeKey="clickCart"/>
-            <click selector="{{StorefrontMiniCartSection.goToCheckout}}" mergeKey="goToCheckout"/>
-            <waitForPageLoad mergeKey="waitForPageLoad2"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" mergeKey="enterEmail"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" mergeKey="enterFirstName"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" mergeKey="enterLastName"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" mergeKey="enterStreet"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" mergeKey="enterCity"/>
-            <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" mergeKey="selectRegion"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" mergeKey="enterPostcode"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" mergeKey="enterTelephone"/>
-            <waitForLoadingMaskToDisappear mergeKey="waitForLoadingMask"/>
-            <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" mergeKey="selectFirstShippingMethod"/>
-            <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" mergeKey="waitForNextButton"/>
-            <click selector="{{CheckoutShippingMethodsSection.next}}" mergeKey="clickNext"/>
-            <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" mergeKey="waitForPlaceOrderButton"/>
-            <click selector="{{CheckoutPaymentSection.placeOrder}}" mergeKey="clickPlaceOrder"/>
-            <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" returnVariable="orderNumber" mergeKey="grabOrderNumber"/>
+            <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+            <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+            <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
+            <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+            <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+            <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+            <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+            <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+            <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+            <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+            <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+            <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" returnVariable="orderNumber" stepKey="grabOrderNumber"/>
             <!-- end todo -->
 
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="goToAdmin"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickLogin"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="goToAdmin"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
 
-            <amOnPage url="{{OrdersPage.url}}" mergeKey="onOrdersPage"/>
-            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="10" mergeKey="waitSpinner1"/>
-            <fillField selector="{{OrdersGridSection.search}}" variable="orderNumber" mergeKey="searchOrderNum"/>
-            <click selector="{{OrdersGridSection.submitSearch}}" mergeKey="submitSearch"/>
-            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="10" mergeKey="waitSpinner2"/>
+            <amOnPage url="{{OrdersPage.url}}" stepKey="onOrdersPage"/>
+            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="10" stepKey="waitSpinner1"/>
+            <fillField selector="{{OrdersGridSection.search}}" variable="orderNumber" stepKey="searchOrderNum"/>
+            <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
+            <waitForElementNotVisible selector="{{OrdersGridSection.spinner}}" time="10" stepKey="waitSpinner2"/>
 
-            <click selector="{{OrdersGridSection.firstRow}}" mergeKey="clickOrderRow"/>
-            <click selector="{{OrderDetailsMainActionsSection.invoice}}" mergeKey="clickInvoice"/>
-            <click selector="{{InvoiceNewSection.submitInvoice}}" mergeKey="clickSubmitInvoice"/>
-            <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." mergeKey="seeSuccessMessage"/>
-            <click selector="{{OrderDetailsOrderViewSection.invoices}}" mergeKey="clickInvoices"/>
-            <waitForElementNotVisible selector="{{OrderDetailsInvoicesSection.spinner}}" time="10" mergeKey="waitSpinner3"/>
-            <see selector="{{OrderDetailsInvoicesSection.content}}" variable="orderNumber" mergeKey="seeInvoice1"/>
-            <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="John Doe" mergeKey="seeInvoice2"/>
-            <click selector="{{OrderDetailsOrderViewSection.information}}" mergeKey="clickInformation"/>
-            <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" mergeKey="seeOrderStatus"/>
-            <amOnPage url="{{InvoicesPage.url}}" mergeKey="goToInvoices"/>
-            <waitForElementNotVisible selector="{{InvoicesGridSection.spinner}}" time="10" mergeKey="waitSpinner4"/>
-            <click selector="{{InvoicesGridSection.filter}}" mergeKey="clickFilters"/>
-            <fillField selector="{{InvoicesFiltersSection.orderNum}}" variable="orderNumber" mergeKey="searchOrderNum2"/>
-            <click selector="{{InvoicesGridSection.firstRow}}" mergeKey="clickInvoice2"/>
-            <see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" mergeKey="seeOrderStatus2"/>
+            <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+            <click selector="{{OrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
+            <click selector="{{InvoiceNewSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+            <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
+            <click selector="{{OrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
+            <waitForElementNotVisible selector="{{OrderDetailsInvoicesSection.spinner}}" time="10" stepKey="waitSpinner3"/>
+            <see selector="{{OrderDetailsInvoicesSection.content}}" variable="orderNumber" stepKey="seeInvoice1"/>
+            <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
+            <click selector="{{OrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
+            <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
+            <amOnPage url="{{InvoicesPage.url}}" stepKey="goToInvoices"/>
+            <waitForElementNotVisible selector="{{InvoicesGridSection.spinner}}" time="10" stepKey="waitSpinner4"/>
+            <click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilters"/>
+            <fillField selector="{{InvoicesFiltersSection.orderNum}}" variable="orderNumber" stepKey="searchOrderNum2"/>
+            <click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
+            <see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
index 629688f7437b8d6e0cc9953b491bb5b5075f12d5..b047b19d4a044c8e966712cc958eb4e9fb5c3c24 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
@@ -12,13 +12,13 @@
         <arguments>
             <argument name="person" defaultValue="SamplePerson"/>
         </arguments>
-        <fillField selector="#foo" userInput="{{person.foo}}" mergeKey="fillField1"/>
-        <fillField selector="#bar" userInput="{{person.bar}}" mergeKey="fillField2"/>
+        <fillField selector="#foo" userInput="{{person.foo}}" stepKey="fillField1"/>
+        <fillField selector="#bar" userInput="{{person.bar}}" stepKey="fillField2"/>
     </actionGroup>
     <actionGroup name="ValidateSlideOutPanelField">
         <arguments>
             <argument name="property" defaultValue=""/>
         </arguments>
-        <see userInput="{{property.name}}" selector="{{ColumnSection.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" mergeKey="seePropertyLabel"/>
+        <see userInput="{{property.name}}" selector="{{ColumnSection.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
     </actionGroup>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml
index 761635f281886c4ace8a7d6b2a2514d03dd59f48..eddae0242f5d45ace0709f5de978ff1f3cfe2bcf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml
@@ -16,7 +16,7 @@
             <group value="skip"/>
         </annotations>
         <before>
-            <createData entity="SamplePerson" mergeKey="beforeData"/>
+            <createData entity="SamplePerson" stepKey="beforeData"/>
         </before>
         <after>
 
@@ -30,26 +30,26 @@
             </annotations>
 
             <!-- Create an entity that depends on another entity -->
-            <createData entity="_defaultCategory" mergeKey="createCategory"/>
-            <createData entity="_defaultProduct" mergeKey="createProduct">
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
                 <required-entity createDataKey="createCategory"/>
             </createData>
 
             <!-- Parameterized url -->
-            <amOnPage url="{{SamplePage.url('foo', SamplePerson.bar)}}" mergeKey="amOnPage"/>
+            <amOnPage url="{{SamplePage.url('foo', SamplePerson.bar)}}" stepKey="amOnPage"/>
 
             <!-- Parameterized selector -->
-            <grabTextFrom selector="{{SampleSection.twoParamElement(SamplePerson.foo, 'bar')}}" returnVariable="myReturnVar" mergeKey="grabTextFrom"/>
+            <grabTextFrom selector="{{SampleSection.twoParamElement(SamplePerson.foo, 'bar')}}" returnVariable="myReturnVar" stepKey="grabTextFrom"/>
 
             <!-- Element with a timeout -->
-            <click selector="{{SampleSection.timeoutElement}}" mergeKey="click"/>
+            <click selector="{{SampleSection.timeoutElement}}" stepKey="click"/>
 
             <!-- ActionGroup -->
-            <actionGroup ref="SampleActionGroup" mergeKey="actionGroup">
+            <actionGroup ref="SampleActionGroup" stepKey="actionGroup">
                 <argument name="person" value="OverrideDefaultPerson"/>
             </actionGroup>
 
-            <actionGroup ref="ValidateSlideOutPanelField" mergeKey="seeAppearanceMinHeightProperty">
+            <actionGroup ref="ValidateSlideOutPanelField" stepKey="seeAppearanceMinHeightProperty">
                 <argument name="property" value="AppearanceMinHeightProperty"/>
             </actionGroup>
         </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml
index e6b3f9b563112fd110ce986d9b7f7469396c40bf..17366a6518c901cb04e7f72da1887d8b68c557b9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml
@@ -14,83 +14,83 @@
             <group value="skip"/>
         </annotations>
         <before>
-            <createData entity="Simple_US_Customer" mergeKey="createData1"/>
+            <createData entity="Simple_US_Customer" stepKey="createData1"/>
         </before>
         <after>
-            <deleteData createDataKey="createData1" mergeKey="deleteData1"/>
+            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
         </after>
         <test name="AssertTest">
-            <createData entity="Simple_US_Customer" mergeKey="createData2"/>
-            <amOnUrl url="https://www.yahoo.com" mergeKey="amOnPage"/>
-            <waitForElementVisible mergeKey="wait1" selector="#uh-logo" time="10"/>
-            <grabTextFrom returnVariable="text" selector="#uh-logo" mergeKey="grabTextFrom1"/>
+            <createData entity="Simple_US_Customer" stepKey="createData2"/>
+            <amOnUrl url="https://www.yahoo.com" stepKey="amOnPage"/>
+            <waitForElementVisible stepKey="wait1" selector="#uh-logo" time="10"/>
+            <grabTextFrom returnVariable="text" selector="#uh-logo" stepKey="grabTextFrom1"/>
 
             <!-- asserts without variable replacement -->
-            <comment mergeKey="c1" userInput="asserts without variable replacement"/>
-            <assertArrayHasKey mergeKey="assertArrayHasKey" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
-            <assertArrayNotHasKey mergeKey="assertArrayNotHasKey" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
-            <assertArraySubset mergeKey="assertArraySubset" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
-            <assertContains mergeKey="assertContains" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
-            <assertCount mergeKey="assertCount" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
-            <assertEmpty mergeKey="assertEmpty" actual="[]" message="pass"/>
-            <assertEquals mergeKey="assertEquals1" expected="text" expectedType="variable" actual="Yahoo" actualType="string" message="pass"/>
-            <assertEquals mergeKey="assertEquals2" expected="Yahoo" expectedType="string" actual="text" actualType="variable" message="pass"/>
-            <assertFalse mergeKey="assertFalse1" actual="0" actualType="bool" message="pass"/>
-            <assertFileNotExists mergeKey="assertFileNotExists1" actual="/out.txt" actualType="string" message="pass"/>
-            <assertFileNotExists mergeKey="assertFileNotExists2" actual="text" actualType="variable" message="pass"/>
-            <assertGreaterOrEquals mergeKey="assertGreaterOrEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-            <assertGreaterThan mergeKey="assertGreaterThan" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-            <assertGreaterThanOrEqual mergeKey="assertGreaterThanOrEqual" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-            <assertInternalType mergeKey="assertInternalType1" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
-            <assertInternalType mergeKey="assertInternalType2" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
-            <assertInternalType mergeKey="assertInternalType3" expected="string" expectedType="string" actual="text" actualType="variable" message="pass"/>
-            <assertLessOrEquals mergeKey="assertLessOrEquals" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-            <assertLessThan mergeKey="assertLessThan" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-            <assertLessThanOrEqual mergeKey="assertLessThanOrEqual" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-            <assertNotContains mergeKey="assertNotContains1" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
-            <assertNotContains mergeKey="assertNotContains2" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
-            <assertNotEmpty mergeKey="assertNotEmpty1" actual="[1, 2]" message="pass"/>
-            <assertNotEmpty mergeKey="assertNotEmpty2" actual="text" actualType="variable" message="pass"/>
-            <assertNotEquals mergeKey="assertNotEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
-            <assertNotNull mergeKey="assertNotNull1" actual="abc" actualType="string" message="pass"/>
-            <assertNotNull mergeKey="assertNotNull2" actual="text" actualType="variable" message="pass"/>
-            <assertNotRegExp mergeKey="assertNotRegExp" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
-            <assertNotSame mergeKey="assertNotSame" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
-            <assertRegExp mergeKey="assertRegExp" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
-            <assertSame mergeKey="assertSame" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
-            <assertStringStartsNotWith mergeKey="assertStringStartsNotWith" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
-            <assertStringStartsWith mergeKey="assertStringStartsWith" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
-            <assertTrue mergeKey="assertTrue" actual="1" actualType="bool" message="pass"/>
+            <comment stepKey="c1" userInput="asserts without variable replacement"/>
+            <assertArrayHasKey stepKey="assertArrayHasKey" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
+            <assertArrayNotHasKey stepKey="assertArrayNotHasKey" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
+            <assertArraySubset stepKey="assertArraySubset" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
+            <assertContains stepKey="assertContains" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
+            <assertCount stepKey="assertCount" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
+            <assertEmpty stepKey="assertEmpty" actual="[]" message="pass"/>
+            <assertEquals stepKey="assertEquals1" expected="text" expectedType="variable" actual="Yahoo" actualType="string" message="pass"/>
+            <assertEquals stepKey="assertEquals2" expected="Yahoo" expectedType="string" actual="text" actualType="variable" message="pass"/>
+            <assertFalse stepKey="assertFalse1" actual="0" actualType="bool" message="pass"/>
+            <assertFileNotExists stepKey="assertFileNotExists1" actual="/out.txt" actualType="string" message="pass"/>
+            <assertFileNotExists stepKey="assertFileNotExists2" actual="text" actualType="variable" message="pass"/>
+            <assertGreaterOrEquals stepKey="assertGreaterOrEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
+            <assertGreaterThan stepKey="assertGreaterThan" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
+            <assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqual" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
+            <assertInternalType stepKey="assertInternalType1" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
+            <assertInternalType stepKey="assertInternalType2" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
+            <assertInternalType stepKey="assertInternalType3" expected="string" expectedType="string" actual="text" actualType="variable" message="pass"/>
+            <assertLessOrEquals stepKey="assertLessOrEquals" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
+            <assertLessThan stepKey="assertLessThan" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
+            <assertLessThanOrEqual stepKey="assertLessThanOrEqual" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
+            <assertNotContains stepKey="assertNotContains1" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
+            <assertNotContains stepKey="assertNotContains2" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
+            <assertNotEmpty stepKey="assertNotEmpty1" actual="[1, 2]" message="pass"/>
+            <assertNotEmpty stepKey="assertNotEmpty2" actual="text" actualType="variable" message="pass"/>
+            <assertNotEquals stepKey="assertNotEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
+            <assertNotNull stepKey="assertNotNull1" actual="abc" actualType="string" message="pass"/>
+            <assertNotNull stepKey="assertNotNull2" actual="text" actualType="variable" message="pass"/>
+            <assertNotRegExp stepKey="assertNotRegExp" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
+            <assertNotSame stepKey="assertNotSame" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
+            <assertRegExp stepKey="assertRegExp" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
+            <assertSame stepKey="assertSame" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
+            <assertStringStartsNotWith stepKey="assertStringStartsNotWith" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
+            <assertStringStartsWith stepKey="assertStringStartsWith" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
+            <assertTrue stepKey="assertTrue" actual="1" actualType="bool" message="pass"/>
 
             <!-- string type that use created data -->
-            <comment mergeKey="c2" userInput="string type that use created data"/>
-            <assertStringStartsWith mergeKey="assert1" expected="D" expectedType="string" actual="$$createData1.lastname$$, $$createData1.firstname$$" actualType="string" message="fail"/>
-            <assertStringStartsNotWith mergeKey="assert2" expected="W" expectedType="string" actual="$createData2.firstname$ $createData2.lastname$" actualType="string" message="pass"/>
-            <assertEquals mergeKey="assert5" expected="$$createData1.lastname$$" expectedType="string" actual="$$createData1.lastname$$" actualType="string" message="pass"/>
+            <comment stepKey="c2" userInput="string type that use created data"/>
+            <assertStringStartsWith stepKey="assert1" expected="D" expectedType="string" actual="$$createData1.lastname$$, $$createData1.firstname$$" actualType="string" message="fail"/>
+            <assertStringStartsNotWith stepKey="assert2" expected="W" expectedType="string" actual="$createData2.firstname$ $createData2.lastname$" actualType="string" message="pass"/>
+            <assertEquals stepKey="assert5" expected="$$createData1.lastname$$" expectedType="string" actual="$$createData1.lastname$$" actualType="string" message="pass"/>
 
             <!-- array type that use created data -->
-            <comment mergeKey="c3" userInput="array type that use created data"/>
-            <assertArraySubset mergeKey="assert9" expected="[$$createData1.lastname$$, $$createData1.firstname$$]" expectedType="array" actual="[$$createData1.lastname$$, $$createData1.firstname$$, 1]" actualType="array" message="pass"/>
-            <assertArraySubset mergeKey="assert10" expected="[$createData2.firstname$, $createData2.lastname$]" expectedType="array" actual="[$createData2.firstname$, $createData2.lastname$, 1]" actualType="array" message="pass"/>
-            <assertArrayHasKey mergeKey="assert3" expected="lastname" expectedType="string" actual="['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]" actualType="array" message="pass"/>
-            <assertArrayHasKey mergeKey="assert4" expected="lastname" expectedType="string" actual="['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]" actualType="array" message="pass"/>
+            <comment stepKey="c3" userInput="array type that use created data"/>
+            <assertArraySubset stepKey="assert9" expected="[$$createData1.lastname$$, $$createData1.firstname$$]" expectedType="array" actual="[$$createData1.lastname$$, $$createData1.firstname$$, 1]" actualType="array" message="pass"/>
+            <assertArraySubset stepKey="assert10" expected="[$createData2.firstname$, $createData2.lastname$]" expectedType="array" actual="[$createData2.firstname$, $createData2.lastname$, 1]" actualType="array" message="pass"/>
+            <assertArrayHasKey stepKey="assert3" expected="lastname" expectedType="string" actual="['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]" actualType="array" message="pass"/>
+            <assertArrayHasKey stepKey="assert4" expected="lastname" expectedType="string" actual="['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]" actualType="array" message="pass"/>
 
             <!-- comment this section before running this test -->
-            <comment mergeKey="c4" userInput="comment this section before running this test"/>
-            <assertInstanceOf mergeKey="assertInstanceOf" expected="User::class" actual="text" actualType="variable" message="pass"/>
-            <assertNotInstanceOf mergeKey="assertNotInstanceOf" expected="User::class" actual="21" actualType="int" message="pass"/>
-            <assertFileExists mergeKey="assertFileExists2" actual="text" actualType="variable" message="pass"/>
-            <assertFileExists mergeKey="assert6" actual="AssertCest.php" actualType="string" message="pass"/>
-            <assertIsEmpty mergeKey="assertIsEmpty" actual="text" actualType="variable" message="pass"/>
-            <assertNull mergeKey="assertNull" actual="text" actualType="variable" message="pass"/>
-            <expectException mergeKey="expectException" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
-            <fail mergeKey="fail" message="fail"/>
-            <fail mergeKey="assert7" message="$createData2.firstname$ $createData2.lastname$"/>
-            <fail mergeKey="assert8" message="$$createData1.firstname$$ $$createData1.lastname$$"/>
+            <comment stepKey="c4" userInput="comment this section before running this test"/>
+            <assertInstanceOf stepKey="assertInstanceOf" expected="User::class" actual="text" actualType="variable" message="pass"/>
+            <assertNotInstanceOf stepKey="assertNotInstanceOf" expected="User::class" actual="21" actualType="int" message="pass"/>
+            <assertFileExists stepKey="assertFileExists2" actual="text" actualType="variable" message="pass"/>
+            <assertFileExists stepKey="assert6" actual="AssertCest.php" actualType="string" message="pass"/>
+            <assertIsEmpty stepKey="assertIsEmpty" actual="text" actualType="variable" message="pass"/>
+            <assertNull stepKey="assertNull" actual="text" actualType="variable" message="pass"/>
+            <expectException stepKey="expectException" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
+            <fail stepKey="fail" message="fail"/>
+            <fail stepKey="assert7" message="$createData2.firstname$ $createData2.lastname$"/>
+            <fail stepKey="assert8" message="$$createData1.firstname$$ $$createData1.lastname$$"/>
             <!-- comment end -->
-            <comment mergeKey="c5" userInput="comment end"/>
+            <comment stepKey="c5" userInput="comment end"/>
 
-            <deleteData createDataKey="createData2" mergeKey="deleteData2"/>
+            <deleteData createDataKey="createData2" stepKey="deleteData2"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
index 690b008fe2952c2d3d121e2f286fbd9efca6d2b1..0f13decf74090fa8b927b9d36f003ee8c51bc7c0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
@@ -14,61 +14,61 @@
             <stories value="Create a Configurable Product By API"/>
         </annotations>
         <before>
-            <createData mergeKey="categoryHandle" entity="SimpleSubCategory" />
-            <createData mergeKey="baseConfigProductHandle" entity="BaseConfigurableProduct" >
+            <createData stepKey="categoryHandle" entity="SimpleSubCategory" />
+            <createData stepKey="baseConfigProductHandle" entity="BaseConfigurableProduct" >
                 <required-entity createDataKey="categoryHandle"/>
             </createData>
-            <createData mergeKey="productAttributeHandle" entity="productAttributeWithTwoOptions"/>
+            <createData stepKey="productAttributeHandle" entity="productAttributeWithTwoOptions"/>
 
-            <createData mergeKey="productAttributeOption1Handle" entity="productAttributeOption1">
+            <createData stepKey="productAttributeOption1Handle" entity="productAttributeOption1">
                 <required-entity createDataKey="productAttributeHandle"/>
             </createData>
-            <createData mergeKey="productAttributeOption2Handle" entity="productAttributeOption2">
+            <createData stepKey="productAttributeOption2Handle" entity="productAttributeOption2">
                 <required-entity createDataKey="productAttributeHandle"/>
             </createData>
 
-            <createData mergeKey="addToAttributeSetHandle" entity="AddToDefaultSet">
+            <createData stepKey="addToAttributeSetHandle" entity="AddToDefaultSet">
                 <required-entity createDataKey="productAttributeHandle"/>
             </createData>
 
-            <getData mergeKey="getAttributeOption1Handle" entity="ProductAttributeOptionGetter" index="1">
+            <getData stepKey="getAttributeOption1Handle" entity="ProductAttributeOptionGetter" index="1">
                 <required-entity createDataKey="productAttributeHandle"/>
             </getData>
-            <getData mergeKey="getAttributeOption2Handle" entity="ProductAttributeOptionGetter" index="2">
+            <getData stepKey="getAttributeOption2Handle" entity="ProductAttributeOptionGetter" index="2">
                 <required-entity createDataKey="productAttributeHandle"/>
             </getData>
 
-            <createData mergeKey="childProductHandle1" entity="SimpleOne">
+            <createData stepKey="childProductHandle1" entity="SimpleOne">
                 <required-entity createDataKey="productAttributeHandle"/>
                 <required-entity createDataKey="getAttributeOption1Handle"/>
             </createData>
-            <createData mergeKey="childProductHandle2" entity="SimpleOne">
+            <createData stepKey="childProductHandle2" entity="SimpleOne">
                 <required-entity createDataKey="productAttributeHandle"/>
                 <required-entity createDataKey="getAttributeOption2Handle"/>
             </createData>
 
-            <createData mergeKey="configProductOptionHandle" entity="ConfigurableProductTwoOptions">
+            <createData stepKey="configProductOptionHandle" entity="ConfigurableProductTwoOptions">
                 <required-entity createDataKey="baseConfigProductHandle"/>
                 <required-entity createDataKey="productAttributeHandle"/>
                 <required-entity createDataKey="getAttributeOption1Handle"/>
                 <required-entity createDataKey="getAttributeOption2Handle"/>
             </createData>
 
-            <createData mergeKey="configProductHandle1" entity="ConfigurableProductAddChild">
+            <createData stepKey="configProductHandle1" entity="ConfigurableProductAddChild">
                 <required-entity createDataKey="childProductHandle1"/>
                 <required-entity createDataKey="baseConfigProductHandle"/>
             </createData>
-            <createData mergeKey="configProductHandle2" entity="ConfigurableProductAddChild">
+            <createData stepKey="configProductHandle2" entity="ConfigurableProductAddChild">
                 <required-entity createDataKey="childProductHandle2"/>
                 <required-entity createDataKey="baseConfigProductHandle"/>
             </createData>
         </before>
         <after>
-            <deleteData mergeKey="d2" createDataKey="childProductHandle1"/>
-            <deleteData mergeKey="d3" createDataKey="childProductHandle2"/>
-            <deleteData mergeKey="d7" createDataKey="baseConfigProductHandle"/>
-            <deleteData mergeKey="d8" createDataKey="categoryHandle"/>
-            <deleteData mergeKey="d6" createDataKey="productAttributeHandle"/>
+            <deleteData stepKey="d2" createDataKey="childProductHandle1"/>
+            <deleteData stepKey="d3" createDataKey="childProductHandle2"/>
+            <deleteData stepKey="d7" createDataKey="baseConfigProductHandle"/>
+            <deleteData stepKey="d8" createDataKey="categoryHandle"/>
+            <deleteData stepKey="d6" createDataKey="productAttributeHandle"/>
         </after>
         <test name="CreateConfigurableProductByApiTest">
         </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
index bdbca5862a2b5d231b18eeeea72f618298674682..b202095bea1e49ea27e830d134ad5a7227a000f6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
@@ -14,10 +14,10 @@
             <stories value="Create a Sales Rule By API"/>
         </annotations>
         <before>
-            <createData mergeKey="saleRule" entity="SimpleSalesRule" />
+            <createData stepKey="saleRule" entity="SimpleSalesRule" />
         </before>
         <test name="CreateSalesRuleByApiTest">
-            <!--see mergeKey="test" userInput="$$saleRule.store_labels[0][store_id]$$" selector="test"/-->
+            <!--see stepKey="test" userInput="$$saleRule.store_labels[0][store_id]$$" selector="test"/-->
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
index b1cfc787acbb76e2a63dc47b11a4442a0e627d86..c571e8694beead5249a819ee961c44a85d0f6880 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
@@ -14,7 +14,7 @@
             <stories value="Minimum Test"/>
         </annotations>
         <after>
-            <seeInCurrentUrl url="/admin/admin/" mergeKey="seeInCurrentUrl"/>
+            <seeInCurrentUrl url="/admin/admin/" stepKey="seeInCurrentUrl"/>
         </after>
         <test name="MinimumFieldsTest">
             <annotations>
@@ -26,10 +26,10 @@
                 <env value="phantomjs"/>
                 <env value="headless"/>
             </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" mergeKey="navigateToAdmin"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickLogin"/>
+            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml
index 12b2a8774c49b11adecdb300d7867d39887a4016..2985d7a51051b3e44ca27a7726e1be4a1bb4cd8e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml
@@ -10,26 +10,26 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <cest name="PersistMultipleEntitiesCest">
         <before>
-            <createData entity="simplesubcategory" mergeKey="simplecategory"/>
-            <createData entity="simpleproduct" mergeKey="simpleproduct1">
+            <createData entity="simplesubcategory" stepKey="simplecategory"/>
+            <createData entity="simpleproduct" stepKey="simpleproduct1">
                 <required-entity createDataKey="simplecategory"/>
             </createData>
-            <createData entity="simpleproduct" mergeKey="simpleproduct2">
+            <createData entity="simpleproduct" stepKey="simpleproduct2">
                 <required-entity createDataKey="categoryLink"/>
             </createData>
         </before>
         <after>
-            <deleteData createDataKey="simpleproduct1" mergeKey="deleteProduct1"/>
-            <deleteData createDataKey="simpleproduct2" mergeKey="deleteProduct2"/>
-            <deleteData createDataKey="simplecategory" mergeKey="deleteCategory"/>
+            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simpleproduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
         </after>
         <test name="PersistMultipleEntitiesTest">
             <annotations>
                 <group value="skip"/>
             </annotations>
-            <amOnPage mergeKey="s11" url="/$$simplecategory.name$$.html" />
-            <waitForPageLoad mergeKey="s33"/>
-            <see mergeKey="s35" selector="{{StorefrontCategoryMainSection.productCount}}" userInput="2"/>
+            <amOnPage stepKey="s11" url="/$$simplecategory.name$$.html" />
+            <waitForPageLoad stepKey="s33"/>
+            <see stepKey="s35" selector="{{StorefrontCategoryMainSection.productCount}}" userInput="2"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml
index 6b931ce3f306f62d2675bdbf155f084600cdea88..0d2facdb09b3bd45285fbbe1373248d69e1c1bfc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml
@@ -16,14 +16,14 @@
             <group value="skip"/>
         </annotations>
         <before>
-            <amOnUrl url="http://127.0.0.1:32772/admin/" mergeKey="amOnPage"/>
-            <createData entity="CustomerEntity1" mergeKey="createData1"/>
-            <createData entity="AssertThis" mergeKey="createData2"/>
+            <amOnUrl url="http://127.0.0.1:32772/admin/" stepKey="amOnPage"/>
+            <createData entity="CustomerEntity1" stepKey="createData1"/>
+            <createData entity="AssertThis" stepKey="createData2"/>
         </before>
         <after>
-            <amOnUrl url="http://127.0.0.1:32772/admin/admin/auth/logout" mergeKey="amOnPage"/>
-            <deleteData createDataKey="createData1" mergeKey="deleteData1"/>
-            <deleteData createDataKey="createData2" mergeKey="deleteData2"/>
+            <amOnUrl url="http://127.0.0.1:32772/admin/admin/auth/logout" stepKey="amOnPage"/>
+            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
+            <deleteData createDataKey="createData2" stepKey="deleteData2"/>
         </after>
         <test name="AllCodeceptionMethodsTest">
             <annotations>
@@ -32,146 +32,146 @@
                 <severity value="CRITICAL"/>
                 <testCaseId value="#"/>
             </annotations>
-            <acceptPopup mergeKey="acceptPopup"/>
-            <amOnPage url="/admin" mergeKey="amOnPage"/>
-            <amOnSubdomain url="admin" mergeKey="amOnSubdomain"/>
-            <amOnUrl url="http://www.google.com/" mergeKey="amOnUrl"/>
-            <appendField userInput="More Words" selector=".stuff" mergeKey="appendField"/>
-            <attachFile userInput="filename.php" selector="#stuff" mergeKey="attachFile"/>
-            <cancelPopup mergeKey="cancelPopup"/>
-            <checkOption selector="#checkbox" mergeKey="checkOption"/>
-            <clearField selector="#field" mergeKey="clearField"/>
-            <click selector="#button" userInput="Context" mergeKey="click1"/>
-            <click selectorArray="['link' => 'Login']" mergeKey="click2"/>
-            <click selectorArray="['link' => 'Login']" userInput="stuff" mergeKey="click3"/>
-            <click userInput="Click" mergeKey="click4"/>
-            <clickWithLeftButton selector="#clickHere" mergeKey="clickWithLeftButton1" x="23" y="324"/>
-            <clickWithLeftButton selectorArray="['css' => '.checkout']" mergeKey="clickWithLeftButton2" x="23" y="324"/>
-            <clickWithLeftButton mergeKey="clickWithLeftButton3" x="23" y="324"/>
-            <clickWithRightButton selector="#clickHere" mergeKey="clickWithRightButton1" x="23" y="324"/>
-            <clickWithRightButton selectorArray="['css' => '.checkout']" mergeKey="clickWithRightButton2" x="23" y="324"/>
-            <clickWithRightButton mergeKey="clickWithRightButton3" x="23" y="324"/>
-            <closeTab mergeKey="closeTab"/>
-            <comment userInput="This is a Comment." mergeKey="comment"/>
-            <createData entity="CustomerEntity1" mergeKey="createData1"/>
-            <deleteData createDataKey="createData1" mergeKey="deleteData1"/>
-            <dontSee userInput="Text" mergeKey="dontSee1"/>
-            <dontSee userInput="Text" selector=".title" mergeKey="dontSee2"/>
-            <dontSee userInput="Text" selectorArray="['css' => 'body h1']" mergeKey="dontSee3"/>
-            <dontSeeCheckboxIsChecked selector="#checkbox" mergeKey="dontSeeCheckboxIsChecked"/>
-            <dontSeeCookie userInput="cookieName" mergeKey="dontSeeCookie1"/>
-            <dontSeeCookie userInput="cookieName" parameterArray="['domainName' => 'stuff']" mergeKey="dontSeeCookie2"/>
-            <dontSeeCurrentUrlEquals url="/stuff" mergeKey="dontSeeCurrentUrlEquals"/>
-            <dontSeeCurrentUrlMatches url="~$/users/(\d+)~" mergeKey="dontSeeCurrentUrlMatches"/>
-            <dontSeeElement selector=".error" mergeKey="dontSeeElement1"/>
-            <dontSeeElement selector="input" parameterArray="['name' => 'login']" mergeKey="dontSeeElement2"/>
-            <dontSeeElementInDOM selector="#stuff" mergeKey="dontSeeElementInDOM1"/>
-            <dontSeeElementInDOM selector="#stuff" parameterArray="['name' => 'login']" mergeKey="dontSeeElementInDOM2"/>
-            <dontSeeInCurrentUrl url="/users/" mergeKey="dontSeeInCurrentUrl"/>
-            <dontSeeInField selector=".field" userInput="stuff" mergeKey="dontSeeInField1"/>
-            <dontSeeInField selectorArray="['name' => 'search']" userInput="Comment Here" mergeKey="dontSeeInField2"/>
-            <dontSeeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'non-existent value', 'input2' => 'other non-existent value']" mergeKey="dontSeeInFormFields"/>
-            <dontSeeInPageSource userInput="Stuff in Page Source" mergeKey="dontSeeInPageSource"/>
-            <!--<dontSeeInSource html="<h1></h1>" mergeKey="dontSeeInSource"/>-->
-            <dontSeeInTitle userInput="Title" mergeKey="dontSeeInTitle"/>
-            <dontSeeLink userInput="Logout" mergeKey="dontSeeLink1"/>
-            <dontSeeLink userInput="Checkout" url="/store/cart.php" mergeKey="dontSeeLink2"/>
-            <dontSeeOptionIsSelected selector="#form .stuff" userInput="Option Name" mergeKey="dontSeeOptionIsSelected"/>
-            <doubleClick selector="#click .here" mergeKey="doubleClick"/>
-            <dragAndDrop selector1="#number1" selector2="#number2" mergeKey="dragAndDrop"/>
-            <executeInSelenium function="function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {$webdriver->get('http://google.com');}" mergeKey="executeInSelenium"/>
-            <executeJS function="return $('#myField').val()" mergeKey="executeJS"/>
-            <fillField selector="#field" userInput="stuff" mergeKey="fillField1"/>
-            <fillField selectorArray="['name' => 'email']" userInput="stuff" mergeKey="fillField2"/>
-            <grabAttributeFrom returnVariable="title" selector="#target" userInput="title" mergeKey="grabAttributeFrom"/>
-            <grabCookie returnVariable="cookie" userInput="cookie" parameterArray="['domain' => 'www.google.com']" mergeKey="grabCookie"/>
-            <grabFromCurrentUrl returnVariable="uri" url="~$/user/(\d+)/~" mergeKey="grabFromCurrentUrl"/>
-            <grabMultiple returnVariable="multiple" selector="a" userInput="href" mergeKey="grabMultiple"/>
-            <grabPageSource returnVariable="pageSource" mergeKey="grabPageSource1"/>
-            <grabTextFrom returnVariable="text" selector="h1" mergeKey="grabTextFrom1"/>
-            <grabValueFrom returnVariable="value1" selector=".form" mergeKey="grabValueFrom1"/>
-            <grabValueFrom returnVariable="value2" selectorArray="['name' => 'username']" mergeKey="grabValueFrom2"/>
-            <loadSessionSnapshot userInput="stuff" mergeKey="loadSessionSnapshot1"/>
-            <loadSessionSnapshot returnVariable="snapshot" userInput="stuff" mergeKey="loadSessionSnapshot2"/>
-            <makeScreenshot userInput="ScreenshotName" mergeKey="makeScreenshot"/>
-            <maximizeWindow mergeKey="maximizeWindow"/>
-            <moveBack mergeKey="moveBack"/>
-            <moveForward mergeKey="moveForward"/>
-            <moveMouseOver selector="#stuff" mergeKey="moveMouseOver1"/>
-            <moveMouseOver selectorArray="['css' => '.checkout']" mergeKey="moveMouseOver2"/>
-            <moveMouseOver x="5" y="5" mergeKey="moveMouseOver3"/>
-            <moveMouseOver selector="#stuff" x="5" y="5" mergeKey="moveMouseOver4"/>
-            <moveMouseOver selectorArray="['css' => '.checkout']" x="5" y="5" mergeKey="moveMouseOver5"/>
-            <openNewTab mergeKey="openNewTab"/>
-            <pauseExecution mergeKey="pauseExecution"/>
-            <performOn selector=".rememberMe" function="function (WebDriver $I) { $I->see('Remember me next time'); $I->seeElement('#LoginForm_rememberMe'); $I->dontSee('Login'); }" mergeKey="performOn1"/>
-            <performOn selector=".rememberMe" function="ActionSequence::build()->see('Warning')->see('Are you sure you want to delete this?')->click('Yes')" mergeKey="performOn2"/>
-            <pressKey selector="#page" userInput="a" mergeKey="pressKey1"/>
-            <pressKey selector="#page" parameterArray="[['ctrl','a'],'new']" mergeKey="pressKey2"/>
-            <pressKey selector="#page" parameterArray="[['shift','111'],'1','x']" mergeKey="pressKey3"/>
-            <pressKey selector="#page" parameterArray="[['ctrl', 'a'], \Facebook\WebDriver\WebDriverKeys::DELETE]" mergeKey="pressKey4"/>
-            <!--pressKey selector="descendant-or-self::*[@id='page']" userInput="u" mergeKey="pressKey5"/-->
-            <reloadPage mergeKey="reloadPage"/>
-            <resetCookie userInput="cookie" mergeKey="resetCookie1"/>
-            <resetCookie userInput="cookie" parameterArray="['domainName' => 'www.google.com']" mergeKey="resetCookie2"/>
-            <resizeWindow width="800" height="600" mergeKey="resizeWindow"/>
-            <saveSessionSnapshot userInput="stuff" mergeKey="saveSessionSnapshot"/>
-            <scrollTo selector="#place" x="20" y="50" mergeKey="scrollTo1"/>
-            <scrollTo selectorArray="['css' => '.checkout']" x="20" y="50" mergeKey="scrollTo2"/>
-            <see userInput="Stuff" mergeKey="see1"/>
-            <see userInput="More Stuff" selector=".stuff" mergeKey="see2"/>
-            <see userInput="More More Stuff" selectorArray="['css' => 'body h1']" mergeKey="see3"/>
-            <seeCheckboxIsChecked selector="#checkbox" mergeKey="seeCheckboxIsChecked"/>
-            <seeCookie userInput="PHPSESSID" mergeKey="seeCookie1"/>
-            <seeCookie userInput="PHPSESSID" parameterArray="['domainName' => 'www.google.com']" mergeKey="seeCookie2"/>
-            <seeCurrentUrlEquals url="/" mergeKey="seeCurrentUrlEquals"/>
-            <seeCurrentUrlMatches url="~$/users/(\d+)~" mergeKey="seeCurrentUrlMatches"/>
-            <seeElement selector=".error" mergeKey="seeElement1"/>
-            <seeElement selectorArray="['css' => 'form input']" mergeKey="seeElement2"/>
-            <seeElement selector=".error" parameterArray="['name' => 'login']" mergeKey="seeElement3"/>
-            <seeElement selectorArray="['css' => 'form input']" parameterArray="['name' => 'login']" mergeKey="seeElement4"/>
-            <seeElementInDOM selector="//form/input[type=hidden]" mergeKey="seeElementInDOM1"/>
-            <seeElementInDOM selector="//form/input[type=hidden]" parameterArray="['name' => 'form']" mergeKey="seeElementInDOM2"/>
-            <seeInCurrentUrl url="home" mergeKey="seeInCurrentUrl1"/>
-            <seeInCurrentUrl url="/home/" mergeKey="seeInCurrentUrl2"/>
-            <seeInField userInput="Stuff" selector="#field" mergeKey="seeInField1"/>
-            <seeInField userInput="Stuff" selectorArray="['name' => 'search']" mergeKey="seeInField2"/>
-            <seeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'value','input2' => 'other value']" mergeKey="seeInFormFields1"/>
-            <seeInFormFields selector=".form-class" parameterArray="[['multiselect' => ['value1','value2'],'checkbox[]]' => ['a checked value','another checked value',]]" mergeKey="seeInFormFields2"/>
-            <!--<seeInPageSource html="<h1></h1>" mergeKey="seeInPageSource"/>-->
-            <seeInPopup userInput="Yes in Popup" mergeKey="seeInPopup"/>
-            <!--<seeInSource html="<h1></h1>" mergeKey="seeInSource"/>-->
-            <seeInTitle userInput="In Title" mergeKey="seeInTitle"/>
-            <seeLink userInput="Logout" mergeKey="seeLink1"/>
-            <seeLink userInput="Logout" url="/logout" mergeKey="seeLink2"/>
-            <seeNumberOfElements selector="tr" userInput="10" mergeKey="seeNumberOfElements1"/>
-            <seeNumberOfElements selector="tr" userInput="[0, 10]" mergeKey="seeNumberOfElements2"/>
-            <seeOptionIsSelected selector=".option" userInput="Visa" mergeKey="seeOptionIsSelected"/>
-            <selectOption selector=".dropDown" userInput="Option Name" mergeKey="selectOption1"/>
-            <selectOption selector="//form/select[@name=account]" parameterArray="['Windows','Linux']" mergeKey="selectOption2"/>
-            <selectOption selector="Which OS do you use?" parameterArray="['text' => 'Windows']" mergeKey="selectOption3"/>
-            <setCookie userInput="PHPSESSID" value="stuff" mergeKey="setCookie1"/>
-            <setCookie userInput="PHPSESSID" value="stuff" parameterArray="['domainName' => 'www.google.com']" mergeKey="setCookie2"/>
-            <submitForm selector="#my-form" parameterArray="['field' => ['value','another value',]]" button="#submit" mergeKey="submitForm2"/>
-            <switchToIFrame mergeKey="switchToIFrame1"/>
-            <switchToIFrame userInput="another_frame" mergeKey="switchToIFrame2"/>
-            <switchToNextTab mergeKey="switchToNextTab1"/>
-            <switchToNextTab userInput="2" mergeKey="switchToNextTab2"/>
-            <switchToPreviousTab mergeKey="switchToPreviewTab1"/>
-            <switchToPreviousTab userInput="1" mergeKey="switchToPreviewTab2"/>
-            <switchToWindow mergeKey="switchToWindow1"/>
-            <switchToWindow userInput="another_window" mergeKey="switchToWindow2"/>
-            <typeInPopup userInput="Stuff for popup" mergeKey="typeInPopup"/>
-            <uncheckOption selector="#option" mergeKey="uncheckOption"/>
-            <unselectOption selector="#dropDown" userInput="Option" mergeKey="unselectOption"/>
-            <wait time="15" mergeKey="wait"/>
-            <waitForElement selector="#button" time="10" mergeKey="waitForElement"/>
-            <waitForElementChange selector="#menu" function="function(\WebDriverElement $el) {return $el->isDisplayed();}" time="100" mergeKey="waitForElementChange"/>
-            <waitForElementNotVisible selector="#a_thing .className" time="30" mergeKey="waitForElementNotVisible"/>
-            <waitForElementVisible selector="#a_thing .className" time="15" mergeKey="waitForElementVisible"/>
-            <waitForJS function="return $.active == 0;" time="30" mergeKey="waitForJS"/>
-            <waitForText userInput="foo" time="30" mergeKey="waitForText1"/>
-            <waitForText userInput="foo" selector=".title" time="30" mergeKey="waitForText2"/>
+            <acceptPopup stepKey="acceptPopup"/>
+            <amOnPage url="/admin" stepKey="amOnPage"/>
+            <amOnSubdomain url="admin" stepKey="amOnSubdomain"/>
+            <amOnUrl url="http://www.google.com/" stepKey="amOnUrl"/>
+            <appendField userInput="More Words" selector=".stuff" stepKey="appendField"/>
+            <attachFile userInput="filename.php" selector="#stuff" stepKey="attachFile"/>
+            <cancelPopup stepKey="cancelPopup"/>
+            <checkOption selector="#checkbox" stepKey="checkOption"/>
+            <clearField selector="#field" stepKey="clearField"/>
+            <click selector="#button" userInput="Context" stepKey="click1"/>
+            <click selectorArray="['link' => 'Login']" stepKey="click2"/>
+            <click selectorArray="['link' => 'Login']" userInput="stuff" stepKey="click3"/>
+            <click userInput="Click" stepKey="click4"/>
+            <clickWithLeftButton selector="#clickHere" stepKey="clickWithLeftButton1" x="23" y="324"/>
+            <clickWithLeftButton selectorArray="['css' => '.checkout']" stepKey="clickWithLeftButton2" x="23" y="324"/>
+            <clickWithLeftButton stepKey="clickWithLeftButton3" x="23" y="324"/>
+            <clickWithRightButton selector="#clickHere" stepKey="clickWithRightButton1" x="23" y="324"/>
+            <clickWithRightButton selectorArray="['css' => '.checkout']" stepKey="clickWithRightButton2" x="23" y="324"/>
+            <clickWithRightButton stepKey="clickWithRightButton3" x="23" y="324"/>
+            <closeTab stepKey="closeTab"/>
+            <comment userInput="This is a Comment." stepKey="comment"/>
+            <createData entity="CustomerEntity1" stepKey="createData1"/>
+            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
+            <dontSee userInput="Text" stepKey="dontSee1"/>
+            <dontSee userInput="Text" selector=".title" stepKey="dontSee2"/>
+            <dontSee userInput="Text" selectorArray="['css' => 'body h1']" stepKey="dontSee3"/>
+            <dontSeeCheckboxIsChecked selector="#checkbox" stepKey="dontSeeCheckboxIsChecked"/>
+            <dontSeeCookie userInput="cookieName" stepKey="dontSeeCookie1"/>
+            <dontSeeCookie userInput="cookieName" parameterArray="['domainName' => 'stuff']" stepKey="dontSeeCookie2"/>
+            <dontSeeCurrentUrlEquals url="/stuff" stepKey="dontSeeCurrentUrlEquals"/>
+            <dontSeeCurrentUrlMatches url="~$/users/(\d+)~" stepKey="dontSeeCurrentUrlMatches"/>
+            <dontSeeElement selector=".error" stepKey="dontSeeElement1"/>
+            <dontSeeElement selector="input" parameterArray="['name' => 'login']" stepKey="dontSeeElement2"/>
+            <dontSeeElementInDOM selector="#stuff" stepKey="dontSeeElementInDOM1"/>
+            <dontSeeElementInDOM selector="#stuff" parameterArray="['name' => 'login']" stepKey="dontSeeElementInDOM2"/>
+            <dontSeeInCurrentUrl url="/users/" stepKey="dontSeeInCurrentUrl"/>
+            <dontSeeInField selector=".field" userInput="stuff" stepKey="dontSeeInField1"/>
+            <dontSeeInField selectorArray="['name' => 'search']" userInput="Comment Here" stepKey="dontSeeInField2"/>
+            <dontSeeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'non-existent value', 'input2' => 'other non-existent value']" stepKey="dontSeeInFormFields"/>
+            <dontSeeInPageSource userInput="Stuff in Page Source" stepKey="dontSeeInPageSource"/>
+            <!--<dontSeeInSource html="<h1></h1>" stepKey="dontSeeInSource"/>-->
+            <dontSeeInTitle userInput="Title" stepKey="dontSeeInTitle"/>
+            <dontSeeLink userInput="Logout" stepKey="dontSeeLink1"/>
+            <dontSeeLink userInput="Checkout" url="/store/cart.php" stepKey="dontSeeLink2"/>
+            <dontSeeOptionIsSelected selector="#form .stuff" userInput="Option Name" stepKey="dontSeeOptionIsSelected"/>
+            <doubleClick selector="#click .here" stepKey="doubleClick"/>
+            <dragAndDrop selector1="#number1" selector2="#number2" stepKey="dragAndDrop"/>
+            <executeInSelenium function="function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {$webdriver->get('http://google.com');}" stepKey="executeInSelenium"/>
+            <executeJS function="return $('#myField').val()" stepKey="executeJS"/>
+            <fillField selector="#field" userInput="stuff" stepKey="fillField1"/>
+            <fillField selectorArray="['name' => 'email']" userInput="stuff" stepKey="fillField2"/>
+            <grabAttributeFrom returnVariable="title" selector="#target" userInput="title" stepKey="grabAttributeFrom"/>
+            <grabCookie returnVariable="cookie" userInput="cookie" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookie"/>
+            <grabFromCurrentUrl returnVariable="uri" url="~$/user/(\d+)/~" stepKey="grabFromCurrentUrl"/>
+            <grabMultiple returnVariable="multiple" selector="a" userInput="href" stepKey="grabMultiple"/>
+            <grabPageSource returnVariable="pageSource" stepKey="grabPageSource1"/>
+            <grabTextFrom returnVariable="text" selector="h1" stepKey="grabTextFrom1"/>
+            <grabValueFrom returnVariable="value1" selector=".form" stepKey="grabValueFrom1"/>
+            <grabValueFrom returnVariable="value2" selectorArray="['name' => 'username']" stepKey="grabValueFrom2"/>
+            <loadSessionSnapshot userInput="stuff" stepKey="loadSessionSnapshot1"/>
+            <loadSessionSnapshot returnVariable="snapshot" userInput="stuff" stepKey="loadSessionSnapshot2"/>
+            <makeScreenshot userInput="ScreenshotName" stepKey="makeScreenshot"/>
+            <maximizeWindow stepKey="maximizeWindow"/>
+            <moveBack stepKey="moveBack"/>
+            <moveForward stepKey="moveForward"/>
+            <moveMouseOver selector="#stuff" stepKey="moveMouseOver1"/>
+            <moveMouseOver selectorArray="['css' => '.checkout']" stepKey="moveMouseOver2"/>
+            <moveMouseOver x="5" y="5" stepKey="moveMouseOver3"/>
+            <moveMouseOver selector="#stuff" x="5" y="5" stepKey="moveMouseOver4"/>
+            <moveMouseOver selectorArray="['css' => '.checkout']" x="5" y="5" stepKey="moveMouseOver5"/>
+            <openNewTab stepKey="openNewTab"/>
+            <pauseExecution stepKey="pauseExecution"/>
+            <performOn selector=".rememberMe" function="function (WebDriver $I) { $I->see('Remember me next time'); $I->seeElement('#LoginForm_rememberMe'); $I->dontSee('Login'); }" stepKey="performOn1"/>
+            <performOn selector=".rememberMe" function="ActionSequence::build()->see('Warning')->see('Are you sure you want to delete this?')->click('Yes')" stepKey="performOn2"/>
+            <pressKey selector="#page" userInput="a" stepKey="pressKey1"/>
+            <pressKey selector="#page" parameterArray="[['ctrl','a'],'new']" stepKey="pressKey2"/>
+            <pressKey selector="#page" parameterArray="[['shift','111'],'1','x']" stepKey="pressKey3"/>
+            <pressKey selector="#page" parameterArray="[['ctrl', 'a'], \Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="pressKey4"/>
+            <!--pressKey selector="descendant-or-self::*[@id='page']" userInput="u" stepKey="pressKey5"/-->
+            <reloadPage stepKey="reloadPage"/>
+            <resetCookie userInput="cookie" stepKey="resetCookie1"/>
+            <resetCookie userInput="cookie" parameterArray="['domainName' => 'www.google.com']" stepKey="resetCookie2"/>
+            <resizeWindow width="800" height="600" stepKey="resizeWindow"/>
+            <saveSessionSnapshot userInput="stuff" stepKey="saveSessionSnapshot"/>
+            <scrollTo selector="#place" x="20" y="50" stepKey="scrollTo1"/>
+            <scrollTo selectorArray="['css' => '.checkout']" x="20" y="50" stepKey="scrollTo2"/>
+            <see userInput="Stuff" stepKey="see1"/>
+            <see userInput="More Stuff" selector=".stuff" stepKey="see2"/>
+            <see userInput="More More Stuff" selectorArray="['css' => 'body h1']" stepKey="see3"/>
+            <seeCheckboxIsChecked selector="#checkbox" stepKey="seeCheckboxIsChecked"/>
+            <seeCookie userInput="PHPSESSID" stepKey="seeCookie1"/>
+            <seeCookie userInput="PHPSESSID" parameterArray="['domainName' => 'www.google.com']" stepKey="seeCookie2"/>
+            <seeCurrentUrlEquals url="/" stepKey="seeCurrentUrlEquals"/>
+            <seeCurrentUrlMatches url="~$/users/(\d+)~" stepKey="seeCurrentUrlMatches"/>
+            <seeElement selector=".error" stepKey="seeElement1"/>
+            <seeElement selectorArray="['css' => 'form input']" stepKey="seeElement2"/>
+            <seeElement selector=".error" parameterArray="['name' => 'login']" stepKey="seeElement3"/>
+            <seeElement selectorArray="['css' => 'form input']" parameterArray="['name' => 'login']" stepKey="seeElement4"/>
+            <seeElementInDOM selector="//form/input[type=hidden]" stepKey="seeElementInDOM1"/>
+            <seeElementInDOM selector="//form/input[type=hidden]" parameterArray="['name' => 'form']" stepKey="seeElementInDOM2"/>
+            <seeInCurrentUrl url="home" stepKey="seeInCurrentUrl1"/>
+            <seeInCurrentUrl url="/home/" stepKey="seeInCurrentUrl2"/>
+            <seeInField userInput="Stuff" selector="#field" stepKey="seeInField1"/>
+            <seeInField userInput="Stuff" selectorArray="['name' => 'search']" stepKey="seeInField2"/>
+            <seeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'value','input2' => 'other value']" stepKey="seeInFormFields1"/>
+            <seeInFormFields selector=".form-class" parameterArray="[['multiselect' => ['value1','value2'],'checkbox[]]' => ['a checked value','another checked value',]]" stepKey="seeInFormFields2"/>
+            <!--<seeInPageSource html="<h1></h1>" stepKey="seeInPageSource"/>-->
+            <seeInPopup userInput="Yes in Popup" stepKey="seeInPopup"/>
+            <!--<seeInSource html="<h1></h1>" stepKey="seeInSource"/>-->
+            <seeInTitle userInput="In Title" stepKey="seeInTitle"/>
+            <seeLink userInput="Logout" stepKey="seeLink1"/>
+            <seeLink userInput="Logout" url="/logout" stepKey="seeLink2"/>
+            <seeNumberOfElements selector="tr" userInput="10" stepKey="seeNumberOfElements1"/>
+            <seeNumberOfElements selector="tr" userInput="[0, 10]" stepKey="seeNumberOfElements2"/>
+            <seeOptionIsSelected selector=".option" userInput="Visa" stepKey="seeOptionIsSelected"/>
+            <selectOption selector=".dropDown" userInput="Option Name" stepKey="selectOption1"/>
+            <selectOption selector="//form/select[@name=account]" parameterArray="['Windows','Linux']" stepKey="selectOption2"/>
+            <selectOption selector="Which OS do you use?" parameterArray="['text' => 'Windows']" stepKey="selectOption3"/>
+            <setCookie userInput="PHPSESSID" value="stuff" stepKey="setCookie1"/>
+            <setCookie userInput="PHPSESSID" value="stuff" parameterArray="['domainName' => 'www.google.com']" stepKey="setCookie2"/>
+            <submitForm selector="#my-form" parameterArray="['field' => ['value','another value',]]" button="#submit" stepKey="submitForm2"/>
+            <switchToIFrame stepKey="switchToIFrame1"/>
+            <switchToIFrame userInput="another_frame" stepKey="switchToIFrame2"/>
+            <switchToNextTab stepKey="switchToNextTab1"/>
+            <switchToNextTab userInput="2" stepKey="switchToNextTab2"/>
+            <switchToPreviousTab stepKey="switchToPreviewTab1"/>
+            <switchToPreviousTab userInput="1" stepKey="switchToPreviewTab2"/>
+            <switchToWindow stepKey="switchToWindow1"/>
+            <switchToWindow userInput="another_window" stepKey="switchToWindow2"/>
+            <typeInPopup userInput="Stuff for popup" stepKey="typeInPopup"/>
+            <uncheckOption selector="#option" stepKey="uncheckOption"/>
+            <unselectOption selector="#dropDown" userInput="Option" stepKey="unselectOption"/>
+            <wait time="15" stepKey="wait"/>
+            <waitForElement selector="#button" time="10" stepKey="waitForElement"/>
+            <waitForElementChange selector="#menu" function="function(\WebDriverElement $el) {return $el->isDisplayed();}" time="100" stepKey="waitForElementChange"/>
+            <waitForElementNotVisible selector="#a_thing .className" time="30" stepKey="waitForElementNotVisible"/>
+            <waitForElementVisible selector="#a_thing .className" time="15" stepKey="waitForElementVisible"/>
+            <waitForJS function="return $.active == 0;" time="30" stepKey="waitForJS"/>
+            <waitForText userInput="foo" time="30" stepKey="waitForText1"/>
+            <waitForText userInput="foo" selector=".title" time="30" stepKey="waitForText2"/>
         </test>
         <test name="AllCustomMethodsTest">
             <annotations>
@@ -180,32 +180,32 @@
                 <severity value="CRITICAL"/>
                 <testCaseId value="#"/>
             </annotations>
-            <assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" mergeKey="assertElementContainsAttribute1"/>
-            <assertElementContainsAttribute selector="#username" attribute="type" expectedValue="text" mergeKey="assertElementContainsAttribute2"/>
-            <assertElementContainsAttribute selector="#username" attribute="name" expectedValue="login[username]" mergeKey="assertElementContainsAttribute3"/>
-            <assertElementContainsAttribute selector="#username" attribute="autofocus" expectedValue="" mergeKey="assertElementContainsAttribute4"/>
-            <assertElementContainsAttribute selector="#username" attribute="data-validate" expectedValue="{required:true}" mergeKey="assertElementContainsAttribute5"/>
-            <assertElementContainsAttribute selector="#username" attribute="placeholder" expectedValue="user name" mergeKey="assertElementContainsAttribute6"/>
-            <assertElementContainsAttribute selector="#username" attribute="autocomplete" expectedValue="off" mergeKey="assertElementContainsAttribute7"/>
-            <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="style" expectedValue="display: none;" mergeKey="assertElementContainsAttribute8"/>
-            <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="border" expectedValue="0" mergeKey="assertElementContainsAttribute9"/>
-            <loginAsAdmin mergeKey="loginAsAdmin1"/>
-            <loginAsAdmin username="admin" password="123123q" mergeKey="loginAsAdmin2"/>
-            <closeAdminNotification mergeKey="closeAdminNotification1"/>
-            <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" mergeKey="searchAndMultiSelect1"/>
-            <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" requiredAction="true" mergeKey="searchAndMultiSelect2"/>
-            <waitForPageLoad mergeKey="waitForPageLoad1"/>
-            <waitForPageLoad time="15" mergeKey="waitForPageLoad2"/>
-            <waitForAjaxLoad mergeKey="waitForAjax1"/>
-            <waitForAjaxLoad time="15" mergeKey="waitForAjax2"/>
-            <dontSeeJsError mergeKey="dontSeeJsError"/>
-            <formatMoney userInput="$300,000" mergeKey="formatMoney1"/>
-            <formatMoney userInput="$300,000" locale="en_US.UTF-8" mergeKey="formatMoney2"/>
-            <mSetLocale userInput="300" locale="en_US.UTF-8" mergeKey="mSetLocale1"/>
-            <mResetLocale mergeKey="mResetLocale1"/>
-            <waitForLoadingMaskToDisappear mergeKey="waitForLoadingMaskToDisappear1"/>
-            <scrollToTopOfPage mergeKey="scrollToTopOfPage"/>
-            <parseFloat userInput="300,000.2325" mergeKey="parseFloat1"/>
+            <assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" stepKey="assertElementContainsAttribute1"/>
+            <assertElementContainsAttribute selector="#username" attribute="type" expectedValue="text" stepKey="assertElementContainsAttribute2"/>
+            <assertElementContainsAttribute selector="#username" attribute="name" expectedValue="login[username]" stepKey="assertElementContainsAttribute3"/>
+            <assertElementContainsAttribute selector="#username" attribute="autofocus" expectedValue="" stepKey="assertElementContainsAttribute4"/>
+            <assertElementContainsAttribute selector="#username" attribute="data-validate" expectedValue="{required:true}" stepKey="assertElementContainsAttribute5"/>
+            <assertElementContainsAttribute selector="#username" attribute="placeholder" expectedValue="user name" stepKey="assertElementContainsAttribute6"/>
+            <assertElementContainsAttribute selector="#username" attribute="autocomplete" expectedValue="off" stepKey="assertElementContainsAttribute7"/>
+            <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="style" expectedValue="display: none;" stepKey="assertElementContainsAttribute8"/>
+            <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="border" expectedValue="0" stepKey="assertElementContainsAttribute9"/>
+            <loginAsAdmin stepKey="loginAsAdmin1"/>
+            <loginAsAdmin username="admin" password="123123q" stepKey="loginAsAdmin2"/>
+            <closeAdminNotification stepKey="closeAdminNotification1"/>
+            <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" stepKey="searchAndMultiSelect1"/>
+            <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" requiredAction="true" stepKey="searchAndMultiSelect2"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <waitForPageLoad time="15" stepKey="waitForPageLoad2"/>
+            <waitForAjaxLoad stepKey="waitForAjax1"/>
+            <waitForAjaxLoad time="15" stepKey="waitForAjax2"/>
+            <dontSeeJsError stepKey="dontSeeJsError"/>
+            <formatMoney userInput="$300,000" stepKey="formatMoney1"/>
+            <formatMoney userInput="$300,000" locale="en_US.UTF-8" stepKey="formatMoney2"/>
+            <mSetLocale userInput="300" locale="en_US.UTF-8" stepKey="mSetLocale1"/>
+            <mResetLocale stepKey="mResetLocale1"/>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
+            <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+            <parseFloat userInput="300,000.2325" stepKey="parseFloat1"/>
         </test>
         <test name="AllVariableMethodsTest">
             <annotations>
@@ -214,51 +214,51 @@
                 <severity value="CRITICAL"/>
                 <testCaseId value="#"/>
             </annotations>
-            <grabFromCurrentUrl returnVariable="randomStuff" mergeKey="grabFromCurrentUrl1"/>
-            <amOnPage variable="randomStuff" mergeKey="amOnPage1"/>
-            <amOnSubdomain variable="randomStuff" mergeKey="amOnSubdomain1"/>
-            <amOnUrl variable="randomStuff" mergeKey="amOnUrl1"/>
-            <appendField variable="randomStuff" selector="#randomField" mergeKey="appendField1"/>
-            <attachFile variable="randomStuff" selector="#filePathField" mergeKey="attachFile1"/>
-            <click variable="randomStuff" mergeKey="click1"/>
-            <dontSee variable="randomStuff" mergeKey="dontSee1"/>
-            <dontSeeCookie variable="randomStuff" mergeKey="dontSeeCookie1"/>
-            <dontSeeCurrentUrlEquals variable="randomStuff" mergeKey="dontSeeCurrentUrlEquals1"/>
-            <dontSeeCurrentUrlMatches variable="randomStuff" mergeKey="dontSeeCurrentUrlMatches1"/>
-            <dontSeeInCurrentUrl variable="randomStuff" mergeKey="dontSeeInCurrentUrl1"/>
-            <dontSeeInField selector="#stuff" variable="randomStuff" mergeKey="dontSeeInField1"/>
-            <dontSeeInPageSource variable="randomStuff" mergeKey="dontSeeInPageSource1"/>
-            <dontSeeInTitle variable="randomStuff" mergeKey="dontSeeInTitle1"/>
-            <dontSeeLink variable="randomStuff" mergeKey="dontSeeLink1"/>
-            <dontSeeOptionIsSelected selector="#dropdown" variable="randomStuff" mergeKey="dontSeeOptionIsSelected1"/>
-            <fillField variable="randomStuff" selector="#field" mergeKey="fillField1"/>
-            <grabAttributeFrom selector="#stuff" returnVariable="moreRandomStuff" variable="randomStuff" mergeKey="grabAttributeFrom1"/>
-            <grabCookie returnVariable="cookies" variable="randomStuff" mergeKey="grabValueFrom1"/>
-            <grabFromCurrentUrl returnVariable="url" variable="randomStuff" mergeKey="grabFromCurrentUrl"/>
-            <grabMultiple returnVariable="multipleThings" selector="a" variable="randomStuff" mergeKey="grabMultiple1"/>
-            <loadSessionSnapshot variable="randomStuff" mergeKey="loadSessionSnapshot"/>
-            <pressKey selector="a" variable="randomStuff" mergeKey="pressKey1"/>
-            <saveSessionSnapshot variable="randomStuff" mergeKey="saveSessionSnapshot1"/>
-            <see variable="randomStuff" mergeKey="see1"/>
-            <seeCookie variable="randomStuff" mergeKey="seeCookie1"/>
-            <seeCurrentUrlEquals variable="randomStuff" mergeKey="seeCurrentUrlEquals1"/>
-            <seeCurrentUrlMatches variable="randomStuff" mergeKey="seeCurrentUrlMatches1"/>
-            <seeInCurrentUrl variable="randomStuff" mergeKey="seeInCurrentUrl1"/>
-            <seeInField selector="a" variable="randomStuff" mergeKey="seeInField1"/>
-            <seeInPopup variable="randomStuff" mergeKey="seeInPopup"/>
-            <seeInTitle variable="randomStuff" mergeKey="seeInTitle1"/>
-            <seeLink variable="randomStuff" mergeKey="seeLink1"/>
-            <seeNumberOfElements selector="#stuff" variable="randomStuff" mergeKey="seeNumberOfElements1"/>
-            <seeOptionIsSelected selector="#stuff" variable="randomStuff" mergeKey="seeOptionIsSelected1"/>
-            <selectOption selector="#stuff" variable="randomStuff" mergeKey="selectOption1"/>
-            <switchToIFrame variable="randomStuff" mergeKey="switchToIFrame1"/>
-            <switchToNextTab variable="randomStuff" mergeKey="switchToNextTab1"/>
-            <switchToPreviousTab variable="randomStuff" mergeKey="switchToPreviousTab1"/>
-            <switchToNextTab variable="randomStuff" mergeKey="switchToNextTab1"/>
-            <switchToWindow variable="randomStuff" mergeKey="switchToWindow1"/>
-            <typeInPopup variable="randomStuff" mergeKey="typeInPopup"/>
-            <unselectOption selector="#option" variable="randomStuff" mergeKey="unselectOption1"/>
-            <waitForText variable="randomStuff" time="5" mergeKey="waitForText1"/>
+            <grabFromCurrentUrl returnVariable="randomStuff" stepKey="grabFromCurrentUrl1"/>
+            <amOnPage variable="randomStuff" stepKey="amOnPage1"/>
+            <amOnSubdomain variable="randomStuff" stepKey="amOnSubdomain1"/>
+            <amOnUrl variable="randomStuff" stepKey="amOnUrl1"/>
+            <appendField variable="randomStuff" selector="#randomField" stepKey="appendField1"/>
+            <attachFile variable="randomStuff" selector="#filePathField" stepKey="attachFile1"/>
+            <click variable="randomStuff" stepKey="click1"/>
+            <dontSee variable="randomStuff" stepKey="dontSee1"/>
+            <dontSeeCookie variable="randomStuff" stepKey="dontSeeCookie1"/>
+            <dontSeeCurrentUrlEquals variable="randomStuff" stepKey="dontSeeCurrentUrlEquals1"/>
+            <dontSeeCurrentUrlMatches variable="randomStuff" stepKey="dontSeeCurrentUrlMatches1"/>
+            <dontSeeInCurrentUrl variable="randomStuff" stepKey="dontSeeInCurrentUrl1"/>
+            <dontSeeInField selector="#stuff" variable="randomStuff" stepKey="dontSeeInField1"/>
+            <dontSeeInPageSource variable="randomStuff" stepKey="dontSeeInPageSource1"/>
+            <dontSeeInTitle variable="randomStuff" stepKey="dontSeeInTitle1"/>
+            <dontSeeLink variable="randomStuff" stepKey="dontSeeLink1"/>
+            <dontSeeOptionIsSelected selector="#dropdown" variable="randomStuff" stepKey="dontSeeOptionIsSelected1"/>
+            <fillField variable="randomStuff" selector="#field" stepKey="fillField1"/>
+            <grabAttributeFrom selector="#stuff" returnVariable="moreRandomStuff" variable="randomStuff" stepKey="grabAttributeFrom1"/>
+            <grabCookie returnVariable="cookies" variable="randomStuff" stepKey="grabValueFrom1"/>
+            <grabFromCurrentUrl returnVariable="url" variable="randomStuff" stepKey="grabFromCurrentUrl"/>
+            <grabMultiple returnVariable="multipleThings" selector="a" variable="randomStuff" stepKey="grabMultiple1"/>
+            <loadSessionSnapshot variable="randomStuff" stepKey="loadSessionSnapshot"/>
+            <pressKey selector="a" variable="randomStuff" stepKey="pressKey1"/>
+            <saveSessionSnapshot variable="randomStuff" stepKey="saveSessionSnapshot1"/>
+            <see variable="randomStuff" stepKey="see1"/>
+            <seeCookie variable="randomStuff" stepKey="seeCookie1"/>
+            <seeCurrentUrlEquals variable="randomStuff" stepKey="seeCurrentUrlEquals1"/>
+            <seeCurrentUrlMatches variable="randomStuff" stepKey="seeCurrentUrlMatches1"/>
+            <seeInCurrentUrl variable="randomStuff" stepKey="seeInCurrentUrl1"/>
+            <seeInField selector="a" variable="randomStuff" stepKey="seeInField1"/>
+            <seeInPopup variable="randomStuff" stepKey="seeInPopup"/>
+            <seeInTitle variable="randomStuff" stepKey="seeInTitle1"/>
+            <seeLink variable="randomStuff" stepKey="seeLink1"/>
+            <seeNumberOfElements selector="#stuff" variable="randomStuff" stepKey="seeNumberOfElements1"/>
+            <seeOptionIsSelected selector="#stuff" variable="randomStuff" stepKey="seeOptionIsSelected1"/>
+            <selectOption selector="#stuff" variable="randomStuff" stepKey="selectOption1"/>
+            <switchToIFrame variable="randomStuff" stepKey="switchToIFrame1"/>
+            <switchToNextTab variable="randomStuff" stepKey="switchToNextTab1"/>
+            <switchToPreviousTab variable="randomStuff" stepKey="switchToPreviousTab1"/>
+            <switchToNextTab variable="randomStuff" stepKey="switchToNextTab1"/>
+            <switchToWindow variable="randomStuff" stepKey="switchToWindow1"/>
+            <typeInPopup variable="randomStuff" stepKey="typeInPopup"/>
+            <unselectOption selector="#option" variable="randomStuff" stepKey="unselectOption1"/>
+            <waitForText variable="randomStuff" time="5" stepKey="waitForText1"/>
         </test>
         <test name="AllReplacementTest">
             <annotations>
@@ -268,36 +268,36 @@
                 <testCaseId value="#"/>
             </annotations>
 
-            <createData entity="CustomerEntity1" mergeKey="testScopeData"/>
-            <createData entity="AssertThis" mergeKey="testScopeData2"/>
+            <createData entity="CustomerEntity1" stepKey="testScopeData"/>
+            <createData entity="AssertThis" stepKey="testScopeData2"/>
 
             <!-- parameterized url that uses literal params -->
-            <amOnPage url="{{SamplePage.url('success','success2')}}" mergeKey="a0"/>
+            <amOnPage url="{{SamplePage.url('success','success2')}}" stepKey="a0"/>
 
             <!-- url referencing data that was created in this <test> -->
-            <amOnPage url="$testScopeData.firstname$.html" mergeKey="a1"/>
+            <amOnPage url="$testScopeData.firstname$.html" stepKey="a1"/>
 
             <!-- url referencing data that was created in a <before> -->
-            <amOnPage url="$$createData1.firstname$$.html" mergeKey="a2"/>
+            <amOnPage url="$$createData1.firstname$$.html" stepKey="a2"/>
 
             <!-- parameterized url that uses created data params -->
-            <amOnPage url="{{SamplePage.url($testScopeData.firstname$,$testScopeData.lastname$)}}" mergeKey="a3"/>
-            <amOnPage url="{{SamplePage.url($$createData1.firstname$$,$$createData1.lastname$$)}}" mergeKey="a4"/>
+            <amOnPage url="{{SamplePage.url($testScopeData.firstname$,$testScopeData.lastname$)}}" stepKey="a3"/>
+            <amOnPage url="{{SamplePage.url($$createData1.firstname$$,$$createData1.lastname$$)}}" stepKey="a4"/>
 
             <!-- parameterized selector that uses literal params -->
-            <click selector="{{SampleSection.oneParamElement('success')}}" mergeKey="c1"/>
-            <click selector="{{SampleSection.twoParamElement('success','success2')}}" mergeKey="c2"/>
+            <click selector="{{SampleSection.oneParamElement('success')}}" stepKey="c1"/>
+            <click selector="{{SampleSection.twoParamElement('success','success2')}}" stepKey="c2"/>
 
             <!-- parameterized selector with literal, static data, and created data  -->
-            <click selector="{{SampleSection.threeParamElement('John', SamplePerson.lastname, $testScopeData.lastname$)}}" mergeKey="c3"/>
+            <click selector="{{SampleSection.threeParamElement('John', SamplePerson.lastname, $testScopeData.lastname$)}}" stepKey="c3"/>
 
             <!-- selector that uses created data -->
-            <click selector="#$testScopeData.firstname$ .$testScopeData.lastname$" mergeKey="c4"/>
-            <click selector="#$$createData1.firstname$$ .$$createData1.lastname$$" mergeKey="c5"/>
+            <click selector="#$testScopeData.firstname$ .$testScopeData.lastname$" stepKey="c4"/>
+            <click selector="#$$createData1.firstname$$ .$$createData1.lastname$$" stepKey="c5"/>
 
             <!-- userInput that uses created data -->
-            <fillField selector="#sample" userInput="Hello $testScopeData.firstname$ $testScopeData.lastname$" mergeKey="f1"/>
-            <fillField selector="#sample" userInput="Hello $$createData1.firstname$$ $$createData1.lastname$$" mergeKey="f2"/>
+            <fillField selector="#sample" userInput="Hello $testScopeData.firstname$ $testScopeData.lastname$" stepKey="f1"/>
+            <fillField selector="#sample" userInput="Hello $$createData1.firstname$$ $$createData1.lastname$$" stepKey="f2"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
index 60b1f945e6b4a9ad25ebe96d596be9b3f29dfc46..005031284b532d82a97f98006d4b396d7416728d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
@@ -10,12 +10,12 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <cest name="SetPaymentConfigurationCest">
         <test name="SetPaypalConfigurationTest">
-            <createData entity="SamplePaypalConfig" mergeKey="createSamplePaypalConfig"/>
-            <createData entity="DefaultPayPalConfig" mergeKey="restoreDefaultPaypalConfig"/>
+            <createData entity="SamplePaypalConfig" stepKey="createSamplePaypalConfig"/>
+            <createData entity="DefaultPayPalConfig" stepKey="restoreDefaultPaypalConfig"/>
         </test>
         <test name="SetBraintreeConfigurationTest">
-            <createData entity="SampleBraintreeConfig" mergeKey="createSampleBraintreeConfig"/>
-            <createData entity="DefaultBraintreeConfig" mergeKey="restoreDefaultBraintreeConfig"/>
+            <createData entity="SampleBraintreeConfig" stepKey="createSampleBraintreeConfig"/>
+            <createData entity="DefaultBraintreeConfig" stepKey="restoreDefaultBraintreeConfig"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
index 7d80719a227ef5b42e795946094addc6ae48cda2..48e87294411f180f81a57d7bd9f18a946bea0b7f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
@@ -18,14 +18,14 @@
             <env value="headless"/>
         </annotations>
         <before>
-            <createData mergeKey="categoryHandle" entity="SimpleSubCategory"/>
-            <createData mergeKey="productHandle" entity="SimpleProduct" >
+            <createData stepKey="categoryHandle" entity="SimpleSubCategory"/>
+            <createData stepKey="productHandle" entity="SimpleProduct" >
                 <required-entity createDataKey="categoryHandle"/>
             </createData>
-            <updateData mergeKey="updateProduct" entity="NewSimpleProduct" createDataKey="productHandle"/>
+            <updateData stepKey="updateProduct" entity="NewSimpleProduct" createDataKey="productHandle"/>
         </before>
         <after>
-            <deleteData mergeKey="delete" createDataKey="productHandle"/>
+            <deleteData stepKey="delete" createDataKey="updateProduct"/>
         </after>
         <test name="UpdateSimpleProductByApiTest">
         </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
index 53692f3f41de6573f306529a756fb52c87afe23e..ef04dfd795a86ea63d6a6b6b0a4455fccdfc91f1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
@@ -17,34 +17,34 @@
             <group value="store"/>
         </annotations>
         <before>
-            <createData mergeKey="b1" entity="customStoreGroup"/>
-            <createData mergeKey="b2" entity="customStoreGroup"/>
+            <createData stepKey="b1" entity="customStoreGroup"/>
+            <createData stepKey="b2" entity="customStoreGroup"/>
         </before>
         <test name="AdminCreateStoreGroupTest">
             <annotations>
                 <title value="Create a store group in admin"/>
                 <description value="Create a store group in admin"/>
             </annotations>
-            <amOnPage mergeKey="s1" url="{{AdminLoginPage.url}}"/>
-            <fillField mergeKey="s3" selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
-            <fillField mergeKey="s5" selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-            <click mergeKey="s7" selector="{{AdminLoginFormSection.signIn}}"/>
-            <amOnPage mergeKey="s9" url="{{AdminSystemStorePage.url}}"/>
+            <amOnPage stepKey="s1" url="{{AdminLoginPage.url}}"/>
+            <fillField stepKey="s3" selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
+            <fillField stepKey="s5" selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+            <click stepKey="s7" selector="{{AdminLoginFormSection.signIn}}"/>
+            <amOnPage stepKey="s9" url="{{AdminSystemStorePage.url}}"/>
 
-            <click mergeKey="s11" selector="{{AdminStoresGridSection.resetButton}}"/>
-            <waitForPageLoad mergeKey="s15" time="10"/>
+            <click stepKey="s11" selector="{{AdminStoresGridSection.resetButton}}"/>
+            <waitForPageLoad stepKey="s15" time="10"/>
 
-            <fillField mergeKey="s17" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b1.group[name]$$"/>
-            <click mergeKey="s19" selector="{{AdminStoresGridSection.searchButton}}"/>
-            <waitForPageLoad mergeKey="s21" time="10"/>
-            <see mergeKey="s23" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b1.group[name]$$"/>
+            <fillField stepKey="s17" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b1.group[name]$$"/>
+            <click stepKey="s19" selector="{{AdminStoresGridSection.searchButton}}"/>
+            <waitForPageLoad stepKey="s21" time="10"/>
+            <see stepKey="s23" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b1.group[name]$$"/>
 
-            <click mergeKey="s31" selector="{{AdminStoresGridSection.resetButton}}"/>
-            <waitForPageLoad mergeKey="s35" time="10"/>
-            <fillField mergeKey="s37" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b2.group[name]$$"/>
-            <click mergeKey="s39" selector="{{AdminStoresGridSection.searchButton}}"/>
-            <waitForPageLoad mergeKey="s41" time="10"/>
-            <see mergeKey="s43" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b2.group[name]$$"/>
+            <click stepKey="s31" selector="{{AdminStoresGridSection.resetButton}}"/>
+            <waitForPageLoad stepKey="s35" time="10"/>
+            <fillField stepKey="s37" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b2.group[name]$$"/>
+            <click stepKey="s39" selector="{{AdminStoresGridSection.searchButton}}"/>
+            <waitForPageLoad stepKey="s41" time="10"/>
+            <see stepKey="s43" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b2.group[name]$$"/>
         </test>
     </cest>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
index b1f452ac565be6f5bf29148c756d51ef24592782..80aa26e20a99990aff4c3a9cc723de6a5a870f52 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
@@ -17,41 +17,41 @@
             <group value="wishlist"/>
         </annotations>
         <before>
-            <createData mergeKey="category" entity="SimpleSubCategory"/>
-            <createData mergeKey="product" entity="SimpleProduct" >
+            <createData stepKey="category" entity="SimpleSubCategory"/>
+            <createData stepKey="product" entity="SimpleProduct" >
                 <required-entity createDataKey="category"/>
             </createData>
-            <createData mergeKey="customer" entity="Simple_US_Customer"/>
-            <createData mergeKey="wishlist" entity="Wishlist">
+            <createData stepKey="customer" entity="Simple_US_Customer"/>
+            <createData stepKey="wishlist" entity="Wishlist">
                 <required-entity createDataKey="customer"/>
                 <required-entity createDataKey="product"/>
             </createData>
         </before>
         <after>
-            <deleteData mergeKey="deleteProduct" createDataKey="product"/>
-            <deleteData mergeKey="deleteCategory" createDataKey="category"/>
-            <deleteData mergeKey="deleteCustomer" createDataKey="customer"/>
+            <deleteData stepKey="deleteProduct" createDataKey="product"/>
+            <deleteData stepKey="deleteCategory" createDataKey="category"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
         </after>
         <test name="StorefrontDeletePersistedWishlistTest">
             <annotations>
                 <title value="Delete a persist wishlist for a customer"/>
                 <description value="Delete a persist wishlist for a customer"/>
             </annotations>
-            <amOnPage mergeKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-            <fillField  mergeKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-            <fillField  mergeKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-            <waitForElementVisible mergeKey="waitForButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <click mergeKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <see mergeKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see mergeKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see mergeKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <waitForPageLoad mergeKey="15"/>
-            <amOnPage mergeKey="amOnWishlist" url="{{StorefrontCustomerWishlistPage.url}}"/>
-            <see mergeKey="seeWishlist" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-            <moveMouseOver mergeKey="mouseOver" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-            <waitForElementVisible mergeKey="waitForRemoveButton" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
-            <click mergeKey="clickRemove" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
-            <see mergeKey="seeEmptyWishlist" userInput="You have no items in your wish list" selector="{{StorefrontCustomerWishlistSection.emptyWishlistText}}"/>
+            <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+            <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+            <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+            <waitForElementVisible stepKey="waitForButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+            <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+            <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+            <waitForPageLoad stepKey="15"/>
+            <amOnPage stepKey="amOnWishlist" url="{{StorefrontCustomerWishlistPage.url}}"/>
+            <see stepKey="seeWishlist" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
+            <moveMouseOver stepKey="mouseOver" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
+            <waitForElementVisible stepKey="waitForRemoveButton" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
+            <click stepKey="clickRemove" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
+            <see stepKey="seeEmptyWishlist" userInput="You have no items in your wish list" selector="{{StorefrontCustomerWishlistSection.emptyWishlistText}}"/>
         </test>
     </cest>
 </config>