diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..0e98c51757162
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Deletes Tier price (first one if there are >1)
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..f4863b1dea421
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+ Update the latest tier price on Advanced Pricing dialog on the Admin Product creation/edit page.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml
new file mode 100644
index 0000000000000..e042e742fd93a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+ Asserts the "Buy X for Y each and save Z" message on PDP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml
new file mode 100644
index 0000000000000..ad31958a0f78d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Asserts Cart Subtotal matches expected Value
+
+
+
+
+
+
+ {{expectedSubtotal}}
+ grabCartSubtotal
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml
new file mode 100644
index 0000000000000..bebd7ba99b95c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Asserts MiniCart Subtotal matches expected value
+
+
+
+
+
+
+
+ {{expectedSubtotal}}
+ grabTextFromMiniCartSubtotalField
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml
new file mode 100644
index 0000000000000..3d43eb4c1e39b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Asserts product price on PLP
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml
new file mode 100644
index 0000000000000..ec347c0b08d0f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Asserts Product Subtotal in the Cart matches expected Value
+
+
+
+
+
+
+ {{expectedSubtotal}}
+ grabSubtotal
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml
new file mode 100644
index 0000000000000..7e22e0550e36d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Asserts the "X as low as Y" message on PLP
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml
new file mode 100644
index 0000000000000..2ccab64b18bef
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Asserts the "X Regular Price Y" message on PLP
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
index 672df19a8e665..cee56eeba5d8a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -12,6 +12,7 @@
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index 8add42ec7493f..36219ae26df06 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -5,8 +5,8 @@
* See COPYING.txt for license details.
*/
-->
-
+
@@ -26,239 +26,342 @@
100
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- $1,000.00
- grabTextFromSubtotalField1
-
-
-
-
-
-
- $1,350.00
- grabTextFromSubtotalField2
-
-
-
-
-
-
- $1,640.00
- grabTextFromSubtotalField3
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
- $1,500.00
- grabTextFromSubtotalField4
-
-
-
- $1,500.00
- grabTextFromCheckoutCartSummarySectionSubtotal1
-
-
-
-
-
- $1,500.00
- grabTextFromMiniCartSubtotalField
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- $1,500.00
- grabTextFromSubtotalField5
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- $1,500.00
- grabTextFromSubtotalField6
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
-
-
- $4,000.00
- grabTextFromSubtotalField7
-
-
-
- $4,000.00
- grabTextFromCheckoutCartSummarySectionSubtotal2
-
-
-
-
-
- $4,000.00
- grabTextFromMiniCartSubtotalField2
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml
new file mode 100644
index 0000000000000..f32cd6c47a7a3
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Click the "Update" button on the Shopping Cart page
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml
new file mode 100644
index 0000000000000..92e7f329ad7f0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Asserts product qty in the Cart
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml
new file mode 100644
index 0000000000000..d61c0e9d0be20
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Changes Product Qty in the Cart
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml
new file mode 100644
index 0000000000000..fcf03b6d5bd3a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Extends GoToCheckoutFromMinicartActionGroup.
+ Clicks on the Storefront Mini Shopping Cart icon.
+ Clicks on 'Proceed to Checkout'.
+ Waits for page loaded.
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml
new file mode 100644
index 0000000000000..51e3c274926fc
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml
new file mode 100644
index 0000000000000..bbb2d35ad1c5e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+