diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 4e169c086336..603188ecc109 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -528,4 +528,18 @@
Yes
RegionCA
+
+ John
+ Doe
+ Magento
+
+ - 4145 Madison Ave
+
+ Culver City
+ US
+ United States
+ California
+ 90232
+ 555-55-555-55
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml
new file mode 100644
index 000000000000..91c47587c946
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ Enable Paypal Paylater Solution For Paypal Express Checkout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml
new file mode 100644
index 000000000000..72dc207575d9
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Disables PayPal payflow link solution. Clicks on Save.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml
new file mode 100644
index 000000000000..eac0639d9237
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Enable pay later option.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml
new file mode 100644
index 000000000000..d7cc3ad4600f
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal Payflow link credentials and other details. Clicks on Save.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml
new file mode 100644
index 000000000000..e7ce4ad4283a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Enable Paypal Paylater Solution For Paypal Standard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml
new file mode 100644
index 000000000000..9fd183c0d408
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml
new file mode 100644
index 000000000000..cfea4bb92fa1
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Enable pay later option.
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml
new file mode 100644
index 000000000000..f968fc4379dd
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml
@@ -0,0 +1,28 @@
+
+
+
+
+ Check the default Dropdown Values Available in Admin Cart Page.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml
new file mode 100644
index 000000000000..f9ab3c09d41b
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ Validate the Default Dropdown values In Paylater
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml
new file mode 100644
index 000000000000..ee2705d8621d
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Verify paylater components after enabling paypal paylater
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml
new file mode 100644
index 000000000000..a89560e3bbc6
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+ On PayPal page asserts order amount and shipping details .
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml
new file mode 100644
index 000000000000..47b18338fcba
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Goes to the 'Storefront Category' page for 'Paylater Message'.
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml
new file mode 100644
index 000000000000..e27980027c54
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ On Storefront Login To PayPal Express Checkout Payflow Edition .
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml
new file mode 100644
index 000000000000..adef4d68b673
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ Select PayPal Express Checkout PayFlow Edition On Payments page.
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index f50daa901b2c..a677a99697c1 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -196,6 +196,14 @@
0
+
+ payment/wps_express/active
+ 1
+
+
+ payment/wps_express/active
+ 0
+
4000000000000002
12
@@ -229,6 +237,13 @@
MksGLTest
Abcd@123
+
+ us_m2_biz@ebay.com
+ PayPal
+ mpilink
+ mpilink
+ 1234_1234L!
+
4111111111111111
12
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml
new file mode 100644
index 000000000000..68e9811cf8e3
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalProductPageConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalProductPageConfigSection.xml
new file mode 100644
index 000000000000..cdec2e27874d
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalProductPageConfigSection.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalStandardConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalStandardConfigSection.xml
new file mode 100644
index 000000000000..634e18c9f546
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalStandardConfigSection.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml
index b3f9ffeaecaf..e6c7672a7a45 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml
@@ -14,6 +14,8 @@
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml
index 9eeaa9d9534c..8d27f8218dec 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -22,6 +22,11 @@
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
index 346961822f8a..98e7600b7824 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
@@ -26,6 +26,11 @@
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml
new file mode 100755
index 000000000000..e9deb4c730e2
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml
new file mode 100644
index 000000000000..cb4265ba43d7
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml
new file mode 100644
index 000000000000..dcda3f2a90ac
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml
new file mode 100644
index 000000000000..90dbe49bf0ce
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml
index 9316194dcc78..4aaa0c3382a7 100644
--- a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml
+++ b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml
@@ -13,9 +13,10 @@
+
-
+
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
index 45a06bc59f10..35d33bbe8892 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
@@ -113,6 +113,9 @@
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
index aae0921b72fe..74352aad926a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -134,7 +134,7 @@
true
- TaxName
+ TaxNameA
TaxNameZeroRate